Always use default method if wildcard patter returned null or empty

dut3062796s · Oct 30, 2015 · 146b44e · 146b44e
1 parent 0a08f6b
commit 146b44e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
@@ -21,7 +21,7 @@
 import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig;
 import com.opensymphony.xwork2.config.entities.ResultConfig;
 import com.opensymphony.xwork2.util.PatternMatcher;
-import com.opensymphony.xwork2.util.WildcardHelper;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -77,7 +77,12 @@ public ActionConfigMatcher(PatternMatcher<?> patternMatcher,
         Map<String, String> vars) {
 
         String methodName = convertParam(orig.getMethodName(), vars);
-        if (methodName != null && !orig.isAllowedMethod(methodName)) {
+
+        if (StringUtils.isEmpty(methodName)) {
+            methodName = ActionConfig.DEFAULT_METHOD;
+        }
+
+        if (!orig.isAllowedMethod(methodName)) {
             return null;
         }