Changeset 8739 in josm for trunk

Timestamp:

2015-09-09T12:48:59+02:00 (9 years ago)

Author:

simon04

Message:

see #11833 - Attempt to fix infinite loop in MultipolygonCache (thanks to wiktorn)

This might occur on concurrent put operations.

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.openstreetmap.josm.Main;
@@ -47 +47 @@
 
     private MultipolygonCache() {
-        this.cache = new HashMap<>();
+        this.cache = new ConcurrentHashMap<>(); // see ticket 11833
         this.selectedPolyData = new ArrayList<>();
         Main.addProjectionChangeListener(this);
@@ -84 +84 @@
             Map<DataSet, Map<Relation, Multipolygon>> map1 = cache.get(nc);
             if (map1 == null) {
-                cache.put(nc, map1 = new HashMap<>());
+                cache.put(nc, map1 = new ConcurrentHashMap<>());
             }
             Map<Relation, Multipolygon> map2 = map1.get(r.getDataSet());
             if (map2 == null) {
-                map1.put(r.getDataSet(), map2 = new HashMap<>());
+                map1.put(r.getDataSet(), map2 = new ConcurrentHashMap<>());
             }
             multipolygon = map2.get(r);