Repository: struts Updated Branches: refs/heads/master 1162ddf82 -> 13f49a097
Fixes wrong injection type Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2fe05057 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2fe05057 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2fe05057 Branch: refs/heads/master Commit: 2fe050578aac9e997480895c8caf4146d2725d04 Parents: 1162ddf Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Apr 13 07:31:16 2017 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Apr 13 07:31:16 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/struts2/interceptor/TokenInterceptor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/2fe05057/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java index 1361671..a31a8e9 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java @@ -23,6 +23,7 @@ package org.apache.struts2.interceptor; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.TextProvider; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.interceptor.ValidationAware; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; @@ -128,8 +129,8 @@ public class TokenInterceptor extends MethodFilterInterceptor { private TextProvider textProvider; @Inject - public void setTextProvider(TextProvider textProvider) { - this.textProvider = textProvider; + public void setTextProviderFactory(TextProviderFactory textProviderFactory) { + this.textProvider = textProviderFactory.createInstance(getClass()); } /**