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 7EB4B10B1E for ; Thu, 27 Mar 2014 17:31:57 +0000 (UTC) Received: (qmail 36723 invoked by uid 500); 27 Mar 2014 17:31:56 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 36374 invoked by uid 500); 27 Mar 2014 17:31:49 -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 36356 invoked by uid 99); 27 Mar 2014 17:31:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2014 17:31:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ACE5289491A; Thu, 27 Mar 2014 17:31:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Thu, 27 Mar 2014 17:31:47 -0000 Message-Id: <60581b89052b431197192c866970d190@git.apache.org> In-Reply-To: <965e08bf539e4864a780c386860cdaee@git.apache.org> References: <965e08bf539e4864a780c386860cdaee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: WW-4250 Uses proper character set for Chinese WW-4250 Uses proper character set for Chinese Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/94e20fef Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/94e20fef Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/94e20fef Branch: refs/heads/develop Commit: 94e20fefcd624282ad6425da750fdd1e289f6436 Parents: 8b845ec Author: Lukasz Lenart Authored: Thu Mar 27 18:31:30 2014 +0100 Committer: Lukasz Lenart Committed: Thu Mar 27 18:31:30 2014 +0100 ---------------------------------------------------------------------- .../xwork2/interceptor/ParametersInterceptor.java | 2 +- .../xwork2/interceptor/ParametersInterceptorTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/94e20fef/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java index 7f3f677..cb38d57 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java @@ -141,7 +141,7 @@ public class ParametersInterceptor extends MethodFilterInterceptor { private static final Logger LOG = LoggerFactory.getLogger(ParametersInterceptor.class); - public static final String ACCEPTED_PARAM_NAMES = "\\w+((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[^x00-xff])+'\\])|(\\('(\\w|[^x00-xff])+'\\)))*"; + public static final String ACCEPTED_PARAM_NAMES = "\\w+((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'\\])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*"; protected static final int PARAM_NAME_MAX_LENGTH = 100; http://git-wip-us.apache.org/repos/asf/struts/blob/94e20fef/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java index e616fb8..50eeb4f 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java @@ -237,6 +237,19 @@ public class ParametersInterceptorTest extends XWorkTestCase { assertEquals(0, existingMap.size()); } + public void testParametersWithChineseInTheName() throws Exception { + Map params = new HashMap(); + params.put("theProtectedMap['名字']", "test1"); + + HashMap extraContext = new HashMap(); + extraContext.put(ActionContext.PARAMETERS, params); + + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.PARAM_INTERCEPTOR_ACTION_NAME, null, extraContext); + proxy.execute(); + Map existingMap = ((SimpleAction) proxy.getAction()).getTheProtectedMap(); + assertEquals(1, existingMap.size()); + } + public void testLargeParameterNameWithDefaultLimit() throws Exception { ParametersInterceptor parametersInterceptor = createParametersInterceptor(); doTestParameterNameLengthRestriction(parametersInterceptor, ParametersInterceptor.PARAM_NAME_MAX_LENGTH);