From e28e7f69b9c3243a76f5a65615fb2917dab689a9 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 6 Oct 2015 13:27:53 +0200
Subject: [PATCH] Includes global-allowed-methods instead of overriding them

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

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 35e20196e..58469698f 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));
                     }
                 }
             }