struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject struts git commit: Includes global-allowed-methods instead of overriding them
Date Tue, 06 Oct 2015 11:28:09 GMT
Repository: struts
Updated Branches:
  refs/heads/master 221ef32e3 -> e28e7f69b


Includes global-allowed-methods instead of overriding them


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e28e7f69
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e28e7f69
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e28e7f69

Branch: refs/heads/master
Commit: e28e7f69b9c3243a76f5a65615fb2917dab689a9
Parents: 221ef32
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Tue Oct 6 13:27:53 2015 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Tue Oct 6 13:27:53 2015 +0200

----------------------------------------------------------------------
 .../xwork2/config/providers/XmlConfigurationProvider.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/e28e7f69/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 35e2019..5846969 100644
--- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -860,7 +860,7 @@ public class XmlConfigurationProvider implements ConfigurationProvider
{
                 if (n != null) {
                     String s = n.getNodeValue().trim();
                     if (s.length() > 0) {
-                        allowedMethods = TextParseUtil.commaDelimitedStringToSet(s);
+                        allowedMethods.addAll(TextParseUtil.commaDelimitedStringToSet(s));
                     }
                 }
             }


Mime
View raw message