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

Always use default method if wildcard patter returned null or empty

Browse Source
This commit is contained in:
Lukasz Lenart
2015-10-30 09:21:54 +01:00
parent 0a08f6b673
commit 146b44e2e8
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
+7 -2
View File
@@ -21,7 +21,7 @@ import com.opensymphony.xwork2.config.entities.ActionConfig;
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 class ActionConfigMatcher extends AbstractMatcher<ActionConfig> implement
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;
}