Changeset 11192 in josm

Timestamp:

2016-10-30T15:25:57+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #13870 - robustness against ​https://bugs.openjdk.java.net/browse/JI-9044959

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -889 +889 @@
                 } catch (PatternSyntaxException e) {
                     throw new ParseError(tr(rxErrorMsg, e.getPattern(), e.getIndex(), e.getMessage()), e);
-                } catch (IllegalArgumentException e) {
+                } catch (IllegalArgumentException | StringIndexOutOfBoundsException e) {
+                    // StringIndexOutOfBoundsException catched because of https://bugs.openjdk.java.net/browse/JI-9044959
+                    // See #13870: To remove after we switch to a version of Java which resolves this bug
                     throw new ParseError(tr(rxErrorMsgNoPos, s, e.getMessage()), e);
                 }

trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java

@@ -9 +9 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
@@ -449 +450 @@
         assertTrue(SearchCompiler.compile(search2).match(tag2));
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/13870">Bug #13870</a>.
+     * @throws ParseError always
+     */
+    @Test(expected = ParseError.class)
+    public void testPattern13870() throws ParseError {
+        // https://bugs.openjdk.java.net/browse/JI-9044959
+        SearchSetting setting = new SearchSetting();
+        setting.regexSearch = true;
+        setting.text = "[";
+        SearchCompiler.compile(setting);
+    }
 }