Drops unneeded if clause
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/45af8765 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/45af8765 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/45af8765 Branch: refs/heads/master Commit: 45af87655d1904bc55934512b5f0790dd04afa2d Parents: 7db5e76 Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Fri Sep 4 11:35:07 2015 +0200 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Fri Sep 4 11:35:07 2015 +0200 ---------------------------------------------------------------------- .../struts2/convention/PackageBasedActionConfigBuilder.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/45af8765/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java ---------------------------------------------------------------------- diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java index 64a0e98..0fc238c 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java @@ -921,9 +921,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder { ActionConfig.Builder actionConfig = new ActionConfig.Builder(pkgCfg.getName(), actionName, className); actionConfig.methodName(actionMethod); - if (!allowedMethods.contains(actionMethod)) { - actionConfig.addAllowedMethod(actionMethod); - } + actionConfig.addAllowedMethod(actionMethod); actionConfig.addAllowedMethod(allowedMethods); actionConfig.addAllowedMethod(pkgCfg.getGlobalAllowedMethods());
