WW-4652 fixed a concurrency issue in addDefaultResourceBundle

apache · Jul 1, 2016 · 39ec62a · 39ec62a
1 parent d066891
commit 39ec62a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java b/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
@@ -38,6 +38,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 
 /**
@@ -141,14 +142,13 @@ public static void setDevMode(boolean devMode) {
      */
     public static void addDefaultResourceBundle(String resourceBundleName) {
         //make sure this doesn't get added more than once
-        ClassLoader ccl;
+        final ClassLoader ccl = getCurrentThreadContextClassLoader();
         synchronized (XWORK_MESSAGES_BUNDLE) {
-            ccl = getCurrentThreadContextClassLoader();
             List<String> bundles = classLoaderMap.get(ccl.hashCode());
             if (bundles == null) {
-                bundles = new ArrayList<String>();
-                classLoaderMap.put(ccl.hashCode(), bundles);
+                bundles = new CopyOnWriteArrayList<>();
                 bundles.add(XWORK_MESSAGES_BUNDLE);
+                classLoaderMap.put(ccl.hashCode(), bundles);
             }
             bundles.remove(resourceBundleName);
             bundles.add(0, resourceBundleName);