From b79c6959a4d5fbfd816e6dce660b095683ad987b Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 19 Oct 2015 20:51:48 +0200
Subject: [PATCH] WW-4536 Checks for patterns in action names to build the same
 key for actions with patterns

(cherry picked from commit 30d30e07dee736243b035eb47be4a1c8dae469a2)

# Conflicts:
#	core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
---
 .../xwork2/validator/AnnotationActionValidatorManager.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 d4b9cc665..641bc438e 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
@@ -231,8 +231,12 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager
         // wild card actions to keep the flexibility provided
         // by the original design (such as mapping different contexts
         // to the same action and method if desired)
+
+        // UPDATE:
+        // WW-4536 Using NameVariablePatternMatcher allows defines actions
+        // with patterns enclosed with '{}', it's similar case to WW-3753
         String configName = config.getName();
-        if (configName.contains(ActionConfig.WILDCARD)) {
+        if (configName.contains(ActionConfig.WILDCARD) || (configName.contains("{") && configName.contains("}"))) {
             sb.append(configName);
             sb.append("|");
             sb.append(proxy.getMethod());