Repository: struts
Updated Branches:
  refs/heads/support-2-3 1b4868df3 -> d028886cd


Drops wrong arg passed to logger


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d028886c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d028886c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d028886c

Branch: refs/heads/support-2-3
Commit: d028886cd1b679b989eb1d1c2fc26e64b4444ec0
Parents: 1b4868d
Author: Lukasz Lenart <lukaszlen...@apache.org>
Authored: Thu Feb 25 20:29:38 2016 +0100
Committer: Lukasz Lenart <lukaszlen...@apache.org>
Committed: Thu Feb 25 20:29:38 2016 +0100

----------------------------------------------------------------------
 .../xwork2/interceptor/DefaultWorkflowInterceptor.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/d028886c/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
----------------------------------------------------------------------
diff --git 
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
 
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
index 9391f1f..e94c163 100644
--- 
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
+++ 
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
@@ -19,6 +19,7 @@ import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.interceptor.annotations.InputConfig;
+import com.opensymphony.xwork2.util.AnnotationUtils;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 
@@ -176,7 +177,7 @@ public class DefaultWorkflowInterceptor extends 
MethodFilterInterceptor {
             resultName = ((ValidationWorkflowAware) 
action).getInputResultName();
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Changing result name from [#0] to [#1] because of 
processing [#2] interface applied to [#3]",
-                        currentResultName, resultName, 
InputConfig.class.getSimpleName(), 
ValidationWorkflowAware.class.getSimpleName(), action);
+                        currentResultName, resultName, 
ValidationWorkflowAware.class.getSimpleName(), action);
             }
         }
         return resultName;

Reply via email to