Changeset 14506 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-12-03T23:15:52+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17068 - synchronize inner classloader set of ImageProvider

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -35 +35 @@
 import java.util.Base64;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -259 +260 @@
 
     /** set of class loaders to take images from */
-    private static final Set<ClassLoader> classLoaders = new HashSet<>();
+    private static final Set<ClassLoader> classLoaders = Collections.synchronizedSet(new HashSet<>());
     static {
         try {
@@ -1208 +1209 @@
         if (path != null && path.startsWith("resource://")) {
             String p = path.substring("resource://".length());
-            for (ClassLoader source : classLoaders) {
-                URL res;
-                if ((res = source.getResource(p + name)) != null)
-                    return res;
+            synchronized (classLoaders) {
+                for (ClassLoader source : classLoaders) {
+                    URL res;
+                    if ((res = source.getResource(p + name)) != null)
+                        return res;
+                }
             }
         } else {