You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/09/28 08:36:52 UTC
[3/5] struts git commit: ConversionErrorInterceptor to extend
MethodFilterIntercept. See WW-4676
ConversionErrorInterceptor to extend MethodFilterIntercept. See WW-4676
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d73a8471
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d73a8471
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d73a8471
Branch: refs/heads/master
Commit: d73a8471a62604f66b22b054cb2cf08e093b27a3
Parents: e7ce5dc
Author: gregh3269 <gr...@gmail.com>
Authored: Wed Aug 3 10:50:44 2016 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Sep 28 10:36:39 2016 +0200
----------------------------------------------------------------------
.../xwork2/interceptor/ConversionErrorInterceptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d73a8471/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
index 6a82e04..f7234e7 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
@@ -75,7 +75,7 @@ import java.util.Map;
*
* @author Jason Carreira
*/
-public class ConversionErrorInterceptor extends AbstractInterceptor {
+public class ConversionErrorInterceptor extends MethodFilterInterceptor {
public static final String ORIGINAL_PROPERTY_OVERRIDE = "original.property.override";
@@ -88,7 +88,7 @@ public class ConversionErrorInterceptor extends AbstractInterceptor {
}
@Override
- public String intercept(ActionInvocation invocation) throws Exception {
+ public String doIntercept(ActionInvocation invocation) throws Exception {
ActionContext invocationContext = invocation.getInvocationContext();
Map<String, Object> conversionErrors = invocationContext.getConversionErrors();