Changeset 18482 in josm for trunk

Timestamp:

2022-06-09T15:00:28+02:00 (23 months ago)

Author:

taylor.smock

Message:

VectorDataSet: Fix MT_CORRECTNESS issues

This was most likely caused by using Collections.synchronizedCollection
initially, and then switching to a ConcurrentHashMap.

File:

• trunk/src/org/openstreetmap/josm/data/vector/VectorDataSet.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/vector/VectorDataSet.java

@@ -165 +165 @@
     @Override
     public void clear() {
-        synchronized (this.dataStoreMap) {
-            this.dataStoreMap.clear();
-        }
+        this.dataStoreMap.clear();
     }
 
@@ -533 +531 @@
         nearestZoom[0] = zoom;
         // Create a new list to avoid concurrent modification issues
-        synchronized (this.dataStoreMap) {
-            final int[] keys = new ArrayList<>(this.dataStoreMap.keySet()).stream().filter(Objects::nonNull)
-              .mapToInt(Integer::intValue).sorted().toArray();
-            final int index;
-            if (this.dataStoreMap.containsKey(zoom)) {
-                index = Arrays.binarySearch(keys, zoom);
-            } else {
-                // (-(insertion point) - 1) = return -> insertion point = -(return + 1)
-                index = -(Arrays.binarySearch(keys, zoom) + 1);
-            }
-            if (index > 0) {
-                nearestZoom[1] = keys[index - 1];
-            }
-            if (index < keys.length - 2) {
-                nearestZoom[2] = keys[index + 1];
-            }
-
-            // TODO cleanup zooms for memory
-        }
+        final int[] keys = new ArrayList<>(this.dataStoreMap.keySet()).stream().filter(Objects::nonNull)
+          .mapToInt(Integer::intValue).sorted().toArray();
+        final int index;
+        if (this.dataStoreMap.containsKey(zoom)) {
+            index = Arrays.binarySearch(keys, zoom);
+        } else {
+            // (-(insertion point) - 1) = return -> insertion point = -(return + 1)
+            index = -(Arrays.binarySearch(keys, zoom) + 1);
+        }
+        if (index > 0) {
+            nearestZoom[1] = keys[index - 1];
+        }
+        if (index < keys.length - 2) {
+            nearestZoom[2] = keys[index + 1];
+        }
+
+        // TODO cleanup zooms for memory
     }