Changeset 13082 in josm for trunk

Timestamp:

2017-11-05T15:15:30+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15519 - add synchronization to MultipolygonCache

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java

@@ -43 +43 @@
     private static final MultipolygonCache INSTANCE = new MultipolygonCache();
 
-    private final Map<DataSet, Map<Relation, Multipolygon>> cache;
-
-    private final Collection<PolyData> selectedPolyData;
+    private final Map<DataSet, Map<Relation, Multipolygon>> cache = new ConcurrentHashMap<>(); // see ticket 11833
+
+    private final Collection<PolyData> selectedPolyData = new ArrayList<>();
 
     private MultipolygonCache() {
-        this.cache = new ConcurrentHashMap<>(); // see ticket 11833
-        this.selectedPolyData = new ArrayList<>();
         Main.addProjectionChangeListener(this);
         DataSet.addSelectionListener(this);
@@ -92 +90 @@
                 multipolygon = new Multipolygon(r);
                 map2.put(r, multipolygon);
-                for (PolyData pd : multipolygon.getCombinedPolygons()) {
-                    if (pd.isSelected()) {
-                        selectedPolyData.add(pd);
+                synchronized (this) {
+                    for (PolyData pd : multipolygon.getCombinedPolygons()) {
+                        if (pd.isSelected()) {
+                            selectedPolyData.add(pd);
+                        }
                     }
                 }
@@ -294 +294 @@
 
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    public synchronized void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
 
         for (Iterator<PolyData> it = selectedPolyData.iterator(); it.hasNext();) {