Changeset 15920 in josm for trunk

Timestamp:

2020-02-24T21:00:34+01:00 (5 years ago)

Author:

simon04

Message:

fix #18764, see #14088 - NPE in findIcon when adding a tag (patch by taylor.smock, extended)

File:

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

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

@@ -379 +379 @@
         private void visitBBox(Environment e, AbstractFinder finder) {
             boolean withNodes = finder instanceof ContainsFinder;
-            if (left instanceof OptimizedGeneralSelector) {
+            if (e.osm.getDataSet() == null) {
+                // do nothing
+            } else if (left instanceof OptimizedGeneralSelector) {
                 if (withNodes && ((OptimizedGeneralSelector) left).matchesBase(OsmPrimitiveType.NODE)) {
                     finder.visit(e.osm.getDataSet().searchNodes(e.osm.getBBox()));
@@ -438 +440 @@
                 e.parent = e.osm;
                 if (right instanceof OptimizedGeneralSelector
+                        && e.osm.getDataSet() != null
                         && ((OptimizedGeneralSelector) right).matchesBase(OsmPrimitiveType.WAY)) {
                     final CrossingFinder crossingFinder = new CrossingFinder(e);