Changeset 13314 in josm

Timestamp:

2018-01-13T02:10:46+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15733 - catch TokenMgrError when parsing invalid validator mapcss files

File:

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

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

@@ -61 +61 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
+import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.TokenMgrError;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.IllegalDataException;
@@ -776 +777 @@
                 Logging.warn(tr("Failed to add {0} to tag checker", i));
                 Logging.log(Logging.LEVEL_WARN, ex);
-            } catch (ParseException ex) {
+            } catch (ParseException | TokenMgrError ex) {
                 Logging.warn(tr("Failed to add {0} to tag checker", i));
                 Logging.warn(ex);
@@ -845 +846 @@
             try {
                 tagChecker.addMapCSS(rule.url);
-            } catch (IOException | ParseException e) {
+            } catch (IOException | ParseException | TokenMgrError e) {
                 Logging.warn(e);
             }