Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D81B217C77 for ; Tue, 6 Oct 2015 11:28:44 +0000 (UTC) Received: (qmail 78019 invoked by uid 500); 6 Oct 2015 11:28:10 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 77979 invoked by uid 500); 6 Oct 2015 11:28:10 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 77970 invoked by uid 99); 6 Oct 2015 11:28:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Oct 2015 11:28:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD787DFF95; Tue, 6 Oct 2015 11:28:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: struts git commit: Includes global-allowed-methods instead of overriding them Date: Tue, 6 Oct 2015 11:28:09 +0000 (UTC) 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 Authored: Tue Oct 6 13:27:53 2015 +0200 Committer: Lukasz Lenart 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)); } } }