Changeset 14007 in josm for trunk

Timestamp:

2018-07-06T19:58:37+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16466 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.InDataSourceArea;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
@@ -764 +765 @@
             if (e.osm instanceof Way && ((Way) e.osm).isClosed())
                 return true;
-            if (e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon())
-                return MultipolygonCache.getInstance().get((Relation) e.osm).getOpenEnds().isEmpty();
+            if (e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon()) {
+                Multipolygon multipolygon = MultipolygonCache.getInstance().get((Relation) e.osm);
+                return multipolygon != null && multipolygon.getOpenEnds().isEmpty();
+            }
             return false;
         }