Changeset 12975 in josm

Timestamp:

2017-10-10T02:21:18+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #13920 - robustness against invalid mapcss code - catch error and log it (fix command is optional)

File:

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

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

@@ -501 +501 @@
                 return null;
             }
-            final Selector matchingSelector = whichSelectorMatchesPrimitive(p);
-            Collection<Command> cmds = new LinkedList<>();
-            for (FixCommand fixCommand : fixCommands) {
-                cmds.add(fixCommand.createCommand(p, matchingSelector));
-            }
-            if (deletion && !p.isDeleted()) {
-                cmds.add(new DeleteCommand(p));
-            }
-            return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(p, matchingSelector)), cmds);
+            try {
+                final Selector matchingSelector = whichSelectorMatchesPrimitive(p);
+                Collection<Command> cmds = new LinkedList<>();
+                for (FixCommand fixCommand : fixCommands) {
+                    cmds.add(fixCommand.createCommand(p, matchingSelector));
+                }
+                if (deletion && !p.isDeleted()) {
+                    cmds.add(new DeleteCommand(p));
+                }
+                return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(p, matchingSelector)), cmds);
+            } catch (IllegalArgumentException e) {
+                Logging.error(e);
+                return null;
+            }
         }