From 57e08fb370e381cec4a134836694f183f7ab2aec Mon Sep 17 00:00:00 2001 From: Kusal Kithul-Godage Date: Sun, 3 Nov 2024 11:20:04 +1100 Subject: [PATCH] WW-3714 Ensure correct delegation of new Interceptor API --- .../com/opensymphony/xwork2/DefaultActionInvocation.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java index f04b765ae8..cb2047f06c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java +++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java @@ -257,7 +257,7 @@ public String invoke() throws Exception { resultCode = executeConditional((ConditionalInterceptor) interceptor); } else { LOG.debug("Executing normal interceptor: {}", interceptorMapping.getName()); - resultCode = interceptor.intercept(this); + resultCode = interceptor.intercept((org.apache.struts2.ActionInvocation) this); } } else { resultCode = invokeActionOnly(); @@ -298,9 +298,9 @@ public String invoke() throws Exception { } protected String executeConditional(ConditionalInterceptor conditionalInterceptor) throws Exception { - if (conditionalInterceptor.shouldIntercept(this)) { + if (conditionalInterceptor.shouldIntercept((org.apache.struts2.ActionInvocation) this)) { LOG.debug("Executing conditional interceptor: {}", conditionalInterceptor.getClass().getSimpleName()); - return conditionalInterceptor.intercept(this); + return conditionalInterceptor.intercept((org.apache.struts2.ActionInvocation) this); } else { LOG.debug("Interceptor: {} is disabled, skipping to next", conditionalInterceptor.getClass().getSimpleName()); return this.invoke();