Changeset 35427 in osm for applications

Timestamp:

2020-04-25T10:01:42+02:00 (4 years ago)

Author:

simon04

Message:

fix #josm19146 - fix exception when parsing invalid dates

Location:

applications/editors/josm/plugins/http2

Files:

• src/org/openstreetmap/josm/plugins/http2/Http2Client.java (modified) (2 diffs)
• test (added)
• test/org (added)
• test/org/openstreetmap (added)
• test/org/openstreetmap/josm (added)
• test/org/openstreetmap/josm/plugins (added)
• test/org/openstreetmap/josm/plugins/http2 (added)
• test/org/openstreetmap/josm/plugins/http2/Http2ClientTest.java (added)

applications/editors/josm/plugins/http2/src/org/openstreetmap/josm/plugins/http2/Http2Client.java

@@ -13 +13 @@
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
+import java.time.DateTimeException;
 import java.time.Duration;
 import java.time.Instant;
@@ -175 +176 @@
         @Override
         public long getExpiration() {
-            return response.headers().firstValue("Expires")
-                    .map(DateTimeFormatter.RFC_1123_DATE_TIME::parse)
-                    .map(t -> 1000L * t.getLong(ChronoField.INSTANT_SECONDS))
-                    .orElse(0L);
+            return parseDate(response.headers().firstValue("Expires").orElse(null));
         }
 
         @Override
         public long getLastModified() {
-            return response.headers().firstValue("Last-Modified")
-                    .map(DateTimeFormatter.RFC_1123_DATE_TIME::parse)
-                    .map(t -> 1000L * t.getLong(ChronoField.INSTANT_SECONDS))
-                    .orElse(0L);
+            return parseDate(response.headers().firstValue("Last-Modified").orElse(null));
+        }
+
+        static long parseDate(String string) {
+            if (string != null) {
+                try {
+                    return DateTimeFormatter.RFC_1123_DATE_TIME.parse(string).getLong(ChronoField.INSTANT_SECONDS) * 1000L;
+                } catch (DateTimeException e) {
+                    Logging.debug(e);
+                }
+            }
+            return 0L;
         }