Changeset 13195 in josm for trunk/src

Timestamp:

2017-12-06T18:55:54+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15641 - avoid CCE in MapCSSTagChecker

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -24 +24 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -311 +312 @@
                     try {
                         final String val = ai.val instanceof Expression
-                                ? (String) ((Expression) ai.val).evaluate(new Environment())
+                                ? Optional.of(((Expression) ai.val).evaluate(new Environment())).map(Object::toString).orElse(null)
                                 : ai.val instanceof String
                                 ? (String) ai.val