(struts) 02/02: WW-3714 Ensure correct delegation of new Interceptor API

[kusal]

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch WW-3714-overriding-behaviour
in repository https://gitbox.apache.org/repos/asf/struts.git

commit c47ab9fbd701458cc691b4623da9d5c8e333160c
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Sun Nov 3 11:20:04 2024 +1100

    WW-3714 Ensure correct delegation of new Interceptor API
---
 .../main/java/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 f04b765ae..cb2047f06 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 class DefaultActionInvocation implements 
ActionInvocation {
                     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 class DefaultActionInvocation implements 
ActionInvocation {
     }
 
     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();