Return-Path: X-Original-To: apmail-struts-dev-archive@www.apache.org Delivered-To: apmail-struts-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 20DE9113E3 for ; Wed, 30 Jul 2014 10:20:53 +0000 (UTC) Received: (qmail 89199 invoked by uid 500); 30 Jul 2014 10:20:52 -0000 Delivered-To: apmail-struts-dev-archive@struts.apache.org Received: (qmail 89155 invoked by uid 500); 30 Jul 2014 10:20:52 -0000 Mailing-List: contact dev-help@struts.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Struts Developers List" Reply-To: "Struts Developers List" Delivered-To: mailing list dev@struts.apache.org Received: (qmail 89144 invoked by uid 99); 30 Jul 2014 10:20:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jul 2014 10:20:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 49BA8950C2F; Wed, 30 Jul 2014 10:20:52 +0000 (UTC) From: lukaszlenart To: dev@struts.apache.org Reply-To: dev@struts.apache.org References: In-Reply-To: Subject: [GitHub] struts pull request: Localized by classloader Content-Type: text/plain Message-Id: <20140730102052.49BA8950C2F@tyr.zones.apache.org> Date: Wed, 30 Jul 2014 10:20:52 +0000 (UTC) Github user lukaszlenart commented on a diff in the pull request: https://github.com/apache/struts/pull/20#discussion_r15575786 --- Diff: xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java --- @@ -136,13 +129,21 @@ public static void setReloadBundles(boolean reloadBundles) { */ public static void addDefaultResourceBundle(String resourceBundleName) { //make sure this doesn't get added more than once - synchronized (DEFAULT_RESOURCE_BUNDLES) { - DEFAULT_RESOURCE_BUNDLES.remove(resourceBundleName); - DEFAULT_RESOURCE_BUNDLES.add(0, resourceBundleName); + ClassLoader ccl = null; + synchronized (classLoaderMap) { + ccl = getThreadCurrentThreadGetContextClassLoader(); + List bundles = classLoaderMap.get(ccl.hashCode()); + if (bundles == null) { + bundles = new ArrayList(); + classLoaderMap.put(ccl.hashCode(), bundles); + bundles.add(XWORK_MESSAGES_BUNDLE); + } + bundles.remove(resourceBundleName); + bundles.add(0, resourceBundleName); --- End diff -- So it's because of test? if so test mu be updated ;-) --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org For additional commands, e-mail: dev-help@struts.apache.org