Changeset 17780 in josm

Timestamp:

2021-04-14T20:00:37+02:00 (3 years ago)

Author:

simon04

Message:

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

Location:

trunk

Files:

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

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

@@ -56 +56 @@
 
         static Factory ofNumberVarArgs(double identity, DoubleUnaryOperator unaryOperator, DoubleBinaryOperator operator) {
-            return args -> env -> args.isEmpty()
-                    ? identity
-                    : args.size() == 1
-                    ? unaryOperator.applyAsDouble(Cascade.convertTo(args.get(0).evaluate(env), Double.class))
-                    : args.stream()
-                    .map(arg -> Cascade.convertTo(arg.evaluate(env), Double.class))
-                    .filter(Objects::nonNull)
-                    .reduce(operator::applyAsDouble)
-                    .orElse(null);
+            return args -> env -> {
+                if (args.isEmpty()) {
+                    return identity;
+                } else if (args.size() == 1) {
+                    return unaryOperator.applyAsDouble(Cascade.convertTo(args.get(0).evaluate(env), Double.class));
+                } else {
+                    return args.stream()
+                            .map(arg -> Cascade.convertTo(arg.evaluate(env), Double.class))
+                            .filter(Objects::nonNull)
+                            .reduce(operator::applyAsDouble).orElse(null);
+                }
+            };
         }
 

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

@@ -613 +613 @@
                 "neg: -13;" +
                 "not: !0;" +
+                "null1: tag(x1) + tag(x2);" +
+                "null2: 3 + tag(does_not_exist) + 5;" +
                 "}");
         source.loadStyleSource();
@@ -623 +625 @@
         assertEquals(-13.0, mc.getCascade(null).get("neg"));
         assertEquals(true, mc.getCascade(null).get("not"));
+        assertNull(mc.getCascade(null).get("null1"));
+        assertEquals(8.0, mc.getCascade(null).get("null2"));
     }