Changeset 17166 in josm for trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

Timestamp:

2020-10-11T21:29:57+02:00 (4 years ago)

Author:

simon04

Message:

fix #19914 - Deal with DateTimeException when using DateUtils

File:

• trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -8 +8 @@
 import java.io.StringReader;
 import java.text.Normalizer;
+import java.time.DateTimeException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -201 +202 @@
                                 // if min timestamp is empty: use lowest possible date
                                 minDate = DateUtils.fromString(rangeA1.isEmpty() ? "1980" : rangeA1).getTime();
-                            } catch (UncheckedParseException ex) {
+                            } catch (UncheckedParseException | DateTimeException ex) {
                                 throw new SearchParseError(tr("Cannot parse timestamp ''{0}''", rangeA1), ex);
                             }
@@ -207 +208 @@
                                 // if max timestamp is empty: use "now"
                                 maxDate = rangeA2.isEmpty() ? System.currentTimeMillis() : DateUtils.fromString(rangeA2).getTime();
-                            } catch (UncheckedParseException ex) {
+                            } catch (UncheckedParseException | DateTimeException ex) {
                                 throw new SearchParseError(tr("Cannot parse timestamp ''{0}''", rangeA2), ex);
                             }