Changeset 17770 in josm for trunk/src

Timestamp:

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

Author:

simon04

Message:

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

Regression of r17758.

File:

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

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;