Repository: struts Updated Branches: refs/heads/support-2-3 f5d455da1 -> 30d30e07d
WW-4536 Drops static to allow redefine the key Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/755ad3fa Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/755ad3fa Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/755ad3fa Branch: refs/heads/support-2-3 Commit: 755ad3fadb0f3b6b6b351c9bc41b59b95c45c07b Parents: f5d455d Author: Lukasz Lenart <[email protected]> Authored: Sat Oct 10 10:10:21 2015 +0200 Committer: Lukasz Lenart <[email protected]> Committed: Sat Oct 10 10:10:21 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/755ad3fa/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java index 9b6beb3..5192e2a 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java @@ -232,7 +232,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager * @param clazz the action. * @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/755ad3fa/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java index 3c64622..7111150 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java +++ b/xwork-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); }
