Changeset 17770 in josm

Timestamp:

2021-04-13T21:12:10+02:00 (4 years ago)

Author:

simon04

Message:

see #20744, fix #20757 - MapCSS: fix NPE

Regression of r17758.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java (modified) (1 diff)

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

@@ -10 +10 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.gui.mappaint.StyleKeys;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -91 +92 @@
             Object value;
             if (val instanceof Expression) {
-                value = ((Expression) val).evaluate(env);
+                try {
+                    value = ((Expression) val).evaluate(env);
+                } catch (RuntimeException ex) {
+                    Logging.error(ex);
+                    value = null;
+                }
             } else {
                 value = val;

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java

@@ -721 +721 @@
         assertEquals("Error at line 1, column 17: Invalid pseudo class specified: foobar", sheet.getErrors().iterator().next().getMessage());
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/20757">Bug #20757</a>.
+     */
+    @Test
+    void testTicket20757() {
+        MapCSSStyleSource source = new MapCSSStyleSource("node {name: osm_user_name()}");
+        source.loadStyleSource();
+        MultiCascade mc = new MultiCascade();
+        source.apply(mc, OsmUtils.createPrimitive("node"), 20, false);
+        assertNull(mc.getCascade(null).get("name"));
+    }
 }