Changeset 17832 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2021-04-27T19:13:50+02:00 (3 years ago)

Author:

simon04

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)

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

@@ -60 +60 @@
                     return identity;
                 } else if (args.size() == 1) {
-                    return unaryOperator.applyAsDouble(Cascade.convertTo(args.get(0).evaluate(env), Double.class));
+                    Double arg = Cascade.convertTo(args.get(0).evaluate(env), Double.class);
+                    return arg == null ? null : unaryOperator.applyAsDouble(arg);
                 } else {
                     return args.stream()