Changeset 13316 in josm for trunk/src/org

Timestamp:

2018-01-14T00:39:35+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15767 - change Main.listeners to CopyOnWriteArrayList and skip synchronization in Main.fireProjectionChanged (idea by bastiK)

File:

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

trunk/src/org/openstreetmap/josm/Main.java

@@ -9 +9 @@
 import java.lang.ref.WeakReference;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -20 +19 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -410 +410 @@
      * created dataset as projection change listener.
      */
-    private static final List<WeakReference<ProjectionChangeListener>> listeners = new ArrayList<>();
+    private static final List<WeakReference<ProjectionChangeListener>> listeners = new CopyOnWriteArrayList<>();
 
     private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
         if ((newValue == null ^ oldValue == null)
                 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
-            synchronized (Main.class) {
-                Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
-                while (it.hasNext()) {
-                    WeakReference<ProjectionChangeListener> wr = it.next();
-                    ProjectionChangeListener listener = wr.get();
-                    if (listener == null) {
-                        it.remove();
-                        continue;
-                    }
-                    listener.projectionChanged(oldValue, newValue);
+            Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
+            while (it.hasNext()) {
+                WeakReference<ProjectionChangeListener> wr = it.next();
+                ProjectionChangeListener listener = wr.get();
+                if (listener == null) {
+                    it.remove();
+                    continue;
                 }
+                listener.projectionChanged(oldValue, newValue);
             }
             if (newValue != null && oldBounds != null && main != null) {