File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed
core/src/main/java/com/opensymphony/xwork2/util Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change 38
38
import java .util .*;
39
39
import java .util .concurrent .ConcurrentHashMap ;
40
40
import java .util .concurrent .ConcurrentMap ;
41
+ import java .util .concurrent .CopyOnWriteArrayList ;
41
42
42
43
43
44
/**
@@ -141,14 +142,13 @@ public static void setDevMode(boolean devMode) {
141
142
*/
142
143
public static void addDefaultResourceBundle (String resourceBundleName ) {
143
144
//make sure this doesn't get added more than once
144
- ClassLoader ccl ;
145
+ final ClassLoader ccl = getCurrentThreadContextClassLoader () ;
145
146
synchronized (XWORK_MESSAGES_BUNDLE ) {
146
- ccl = getCurrentThreadContextClassLoader ();
147
147
List <String > bundles = classLoaderMap .get (ccl .hashCode ());
148
148
if (bundles == null ) {
149
- bundles = new ArrayList <String >();
150
- classLoaderMap .put (ccl .hashCode (), bundles );
149
+ bundles = new CopyOnWriteArrayList <>();
151
150
bundles .add (XWORK_MESSAGES_BUNDLE );
151
+ classLoaderMap .put (ccl .hashCode (), bundles );
152
152
}
153
153
bundles .remove (resourceBundleName );
154
154
bundles .add (0 , resourceBundleName );
You can’t perform that action at this time.
0 commit comments