Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4652 fixed a concurrency issue in addDefaultResourceBundle

Browse Source
This commit is contained in:
Przemek Bruski
2016-07-01 16:36:36 +02:00
parent d06689120d
commit 39ec62ac35
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
+4 -4
View File
@@ -38,6 +38,7 @@ import java.text.MessageFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
/**
@@ -141,14 +142,13 @@ public class LocalizedTextUtil {
*/
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);