Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4536 Checks for patterns in action names to build the same key for actions with patterns

Browse Source 
(cherry picked from commit 30d30e07de)

# Conflicts:
#	core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
This commit is contained in:
Lukasz Lenart
2015-10-19 20:51:48 +02:00
parent 5dcbe657b0
commit b79c6959a4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
+5 -1
View File
@@ -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());