struts git commit: Drops wrong arg passed to logger

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/master e2c6b42b8 -> 5d9865092


Drops wrong arg passed to logger

Conflicts:
        
core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java


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

Branch: refs/heads/master
Commit: 5d986509215f439644cbb2a3b0f0beae6f1b5cd0
Parents: e2c6b42
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:48:12 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/struts/blob/5d986509/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
index c71eade..cd162a7 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
@@ -21,7 +21,7 @@ import 
com.opensymphony.xwork2.interceptor.annotations.InputConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
+import com.opensymphony.xwork2.util.AnnotationUtils;
 import java.lang.reflect.Method;
 
 /**
@@ -189,7 +189,7 @@ public class DefaultWorkflowInterceptor extends 
MethodFilterInterceptor {
         if (action instanceof ValidationWorkflowAware) {
             resultName = ((ValidationWorkflowAware) 
action).getInputResultName();
             LOG.debug("Changing result name from [{}] to [{}] because of 
processing [{}] interface applied to [{}]",
-                        currentResultName, resultName, 
InputConfig.class.getSimpleName(), 
ValidationWorkflowAware.class.getSimpleName(), action);
+                        currentResultName, resultName, 
ValidationWorkflowAware.class.getSimpleName(), action);
         }
         return resultName;
     }