Changeset 7447 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2014-08-27T17:40:39+02:00 (10 years ago)

Author:

bastiK

Message:

fixed #10425 - ConcurrentModificationException when auto update mappaint file

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)

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

@@ -69 +69 @@
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
 import org.openstreetmap.josm.gui.mappaint.TextElement;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
 import org.openstreetmap.josm.tools.CompositeList;
@@ -1342 +1343 @@
         @Override
         public List<StyleRecord> call() throws Exception {
-            for (int i = from; i<to; i++) {
-                OsmPrimitive osm = input.get(i);
-                if (osm.isDrawable()) {
-                    osm.accept(this);
-                }
-            }
-            return output;
+            synchronized (MapCSSStyleSource.STYLE_SOURCE_LOCK) {
+                for (int i = from; i<to; i++) {
+                    OsmPrimitive osm = input.get(i);
+                    if (osm.isDrawable()) {
+                        osm.accept(this);
+                    }
+                }
+                return output;
+            }
         }