Changeset 18816 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2023-08-22T17:26:18+02:00 (9 months ago)

Author:

taylor.smock

Message:

Fix #23134: Cancelling a json download will cause an exception dialog

We extract the underlying IOException from the JsonException into an
IllegalDataException which can be parsed by calling methods and properly handled.

File:

• trunk/src/org/openstreetmap/josm/io/OsmJsonReader.java (modified) (3 diffs)

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.net.SocketException;
 import java.util.Collection;
 import java.util.Map.Entry;
@@ -33 +33 @@
 /**
  * Parser for the Osm API (JSON output). Read from an input stream and construct a dataset out of it.
- *
+ * <p>
  * For each json element, there is a dedicated method.
  * @since 14086
@@ -190 +190 @@
             throw new IllegalDataException(exception);
         } catch (JsonException exception) {
-            if (exception.getCause() instanceof SocketException) {
-                SocketException soe = (SocketException) exception.getCause();
+            if (exception.getCause() instanceof IOException) {
+                IOException soe = (IOException) exception.getCause();
                 soe.addSuppressed(exception); // Add the caught exception as a suppressed exception
                 throw new IllegalDataException(soe); // NOPMD -- PreserveStackTrace should be fixed with PMD 7