Repository: struts Updated Branches: refs/heads/master 617bfd23d -> b79c6959a
WW-4536 Drops static to allow redefine the key (cherry picked from commit 755ad3fadb0f3b6b6b351c9bc41b59b95c45c07b) Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5dcbe657 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5dcbe657 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5dcbe657 Branch: refs/heads/master Commit: 5dcbe657b015c6df5ebbdf35e2548cef41099116 Parents: 617bfd2 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Oct 19 20:49:49 2015 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Oct 19 20:49:49 2015 +0200 ---------------------------------------------------------------------- .../xwork2/validator/AnnotationActionValidatorManager.java | 2 +- .../xwork2/validator/AnnotationActionValidatorManagerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/5dcbe657/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java index c0f41fe..d4b9cc6 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java @@ -210,7 +210,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager * @param context context * @return a validator key which is the class name plus context. */ - protected static String buildValidatorKey(Class clazz, String context) { + protected String buildValidatorKey(Class clazz, String context) { ActionInvocation invocation = ActionContext.getContext().getActionInvocation(); ActionProxy proxy = invocation.getProxy(); ActionConfig config = proxy.getConfig(); http://git-wip-us.apache.org/repos/asf/struts/blob/5dcbe657/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java index 3c64622..7111150 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java @@ -86,7 +86,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase { } public void testBuildValidatorKey() { - String validatorKey = AnnotationActionValidatorManager.buildValidatorKey(SimpleAnnotationAction.class, "name"); + String validatorKey = annotationActionValidatorManager.buildValidatorKey(SimpleAnnotationAction.class, "name"); assertEquals(SimpleAnnotationAction.class.getName() + "/packageName/name", validatorKey); }
