Changeset 17166 in josm for trunk/src/org/openstreetmap/josm/io/AbstractReader.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/io/AbstractReader.java (modified) (3 diffs)

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);
         }
     }