Updates as stated in PR#20 comments - synchronized code block inside addDefaultResourceBundle method using XWORK_MESSAGES_BUNDLE.
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/939a3e20 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/939a3e20 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/939a3e20 Branch: refs/heads/develop Commit: 939a3e20400d915de809fbd0e304c1bd2fac5813 Parents: 9254aaa Author: Luigi Fugaro <l.fug...@gmail.com> Authored: Thu Jul 31 12:08:30 2014 +0200 Committer: Luigi Fugaro <l.fug...@gmail.com> Committed: Thu Jul 31 12:08:30 2014 +0200 ---------------------------------------------------------------------- .../main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/939a3e20/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java index 4e9d4eb..3219450 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java @@ -130,7 +130,7 @@ public class LocalizedTextUtil { public static void addDefaultResourceBundle(String resourceBundleName) { //make sure this doesn't get added more than once ClassLoader ccl = null; - synchronized (classLoaderMap) { + synchronized (XWORK_MESSAGES_BUNDLE) { ccl = getCurrentThreadContextClassLoader(); Set<String> bundles = classLoaderMap.get(ccl.hashCode()); if (bundles == null) {
