Adds null-safety
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4c7a7dd6 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4c7a7dd6 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4c7a7dd6 Branch: refs/heads/master Commit: 4c7a7dd6c02457cf006318ed4621b7c432cc478c Parents: 63bb6e3 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Aug 31 21:46:16 2015 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Aug 31 21:46:16 2015 +0200 ---------------------------------------------------------------------- .../com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/4c7a7dd6/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java ---------------------------------------------------------------------- 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 index bb97ce8..7f17e41 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java @@ -77,7 +77,7 @@ public class ActionConfigMatcher extends AbstractMatcher<ActionConfig> implement Map<String, String> vars) { String methodName = convertParam(orig.getMethodName(), vars); - if (!orig.isAllowedMethod(methodName)) { + if (methodName != null && !orig.isAllowedMethod(methodName)) { return null; }
