Repository: struts Updated Branches: refs/heads/master 6c2ff6f15 -> 9ee5c4e6e
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/5e07b957 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5e07b957 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5e07b957 Branch: refs/heads/master Commit: 5e07b9574c66110b9a44338c6c7290a65be276f3 Parents: 7fdc103 Author: gregh3269 <gregh3...@gmail.com> Authored: Wed Aug 3 10:50:44 2016 +0100 Committer: gregh3269 <gregh3...@gmail.com> Committed: Wed Aug 3 10:50:44 2016 +0100 ---------------------------------------------------------------------- .../xwork2/interceptor/ConversionErrorInterceptor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/5e07b957/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();
