Changeset 17166 in josm for trunk

Timestamp:

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

Author:

simon04

Message:

fix #19914 - Deal with DateTimeException when using DateUtils

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/search/SearchCompiler.java (modified) (3 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• io/AbstractReader.java (modified) (3 diffs)
• io/GpxReader.java (modified) (2 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);
                             }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -23 +23 @@
 import java.io.File;
 import java.io.IOException;
+import java.time.DateTimeException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -879 +880 @@
                 wpt.setTime(Integer.toUnsignedLong(n.getRawTimestamp()));
             }
-        } catch (UncheckedParseException e) {
+        } catch (UncheckedParseException | DateTimeException e) {
             Logging.error(e);
         }

trunk/src/org/openstreetmap/josm/io/AbstractReader.java

@@ -8 +8 @@
 import java.io.InputStreamReader;
 import java.text.MessageFormat;
+import java.time.DateTimeException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45 +46 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -425 +427 @@
 
     protected final void parseTimestamp(PrimitiveData current, String time) {
-        if (time != null && !time.isEmpty()) {
+        if (time == null || time.isEmpty()) {
+            return;
+        }
+        try {
             int timestamp = timestampCache.computeIfAbsent(time, t -> (int) (DateUtils.tsFromString(t) / 1000));
             current.setRawTimestamp(timestamp);
+        } catch (UncheckedParseException | DateTimeException e) {
+            Logging.error(e);
         }
     }

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -7 +7 @@
 import java.io.InputStream;
 import java.io.Reader;
+import java.time.DateTimeException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -477 +478 @@
                     try {
                         currentWayPoint.setTimeInMillis(DateUtils.tsFromString(accumulator.toString()));
-                    } catch (UncheckedParseException e) {
+                    } catch (UncheckedParseException | DateTimeException e) {
                         Logging.error(e);
                     }