Changeset 7447 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

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/gui/mappaint/ElemStyles.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Pair;
@@ -446 +447 @@
      */
     public static AreaElemStyle getAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
-        if (MapPaintStyles.getStyles() == null)
+        synchronized (MapCSSStyleSource.STYLE_SOURCE_LOCK) {
+            if (MapPaintStyles.getStyles() == null)
+                return null;
+            for (ElemStyle s : MapPaintStyles.getStyles().generateStyles(p, 1.0, null, pretendWayIsClosed).a) {
+                if (s instanceof AreaElemStyle)
+                    return (AreaElemStyle) s;
+            }
             return null;
-        for (ElemStyle s : MapPaintStyles.getStyles().generateStyles(p, 1.0, null, pretendWayIsClosed).a) {
-            if (s instanceof AreaElemStyle)
-                return (AreaElemStyle) s;
-        }
-        return null;
+        }
     }