Changeset 18656 in josm for trunk/src/org

Timestamp:

2023-02-09T17:30:58+01:00 (23 months ago)

Author:

taylor.smock

Message:

Fix #22680: Unexpected exception when downloading GeoJSON

This occurs when we start to read the JSON, then something comes along and
interrupts the stream from the server. This then causes a JsonException
(a RuntimeException) to be thrown.

This patch catches the JsonException and then either rethrows it if the
cause was not an IOException or throws a new IllegalDataException with
the IOException as the cause and the JsonException as a suppressed exception.

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/OsmJsonReader.java (modified) (3 diffs)
• tools/HttpClient.java (modified) (1 diff)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
@@ -10 +11 @@
 import javax.json.Json;
 import javax.json.JsonArray;
+import javax.json.JsonException;
 import javax.json.JsonNumber;
 import javax.json.JsonObject;
@@ -179 +181 @@
     @Override
     protected DataSet doParseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
-        return doParseDataSet(source, progressMonitor, ir -> {
-            setParser(Json.createParser(ir));
-            parse();
-        });
+        try {
+            return doParseDataSet(source, progressMonitor, ir -> {
+                setParser(Json.createParser(ir));
+                parse();
+            });
+        } catch (JsonException exception) {
+            if (exception.getCause() instanceof IOException) {
+                IllegalDataException ide = new IllegalDataException(exception.getCause());
+                // PMD 7 should be able to figure out that this is not an issue. See https://github.com/pmd/pmd/issues/2134 .
+                ide.addSuppressed(exception);
+                throw ide; // NOPMD
+            } else {
+                throw exception;
+            }
+        }
     }
 

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -34 +34 @@
 import org.openstreetmap.josm.io.auth.DefaultAuthenticator;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.TextUtils;
 
 /**