Changeset 36146 in osm for applications/editors/josm/plugins/geochat/src/geochat/JsonQueryUtil.java

Timestamp:

2023-09-20T17:53:20+02:00 (12 months ago)

Author:

taylor.smock

Message:

Fix #23171: UnknownHostException may cause issues in GeoChat

This appears to be something that can occur when running under WebStart.
To fix this, we check if (a) the JOSM website is offline and (b) if we are
running under webstart. If so, we don't check for messages.

Additionally, this patch converts geochat from the older time classes to the
newer java.time classes and fixes some lint issues.

File:

• applications/editors/josm/plugins/geochat/src/geochat/JsonQueryUtil.java (modified) (3 diffs)

applications/editors/josm/plugins/geochat/src/geochat/JsonQueryUtil.java

@@ -6 +6 @@
 import java.io.InputStream;
 import java.net.URI;
+import java.util.ServiceConfigurationError;
 
 import jakarta.json.Json;
@@ -52 +53 @@
         if (inp == null)
             throw new IOException("Empty response");
-        try (JsonReader reader = Json.createReader(inp)){
+        try (JsonReader reader = Json.createReader(inp)) {
             return reader.readObject();
-        } catch (JsonException e) {
+        } catch (ServiceConfigurationError | JsonException e) {
             throw new IOException("Failed to parse JSON: " + e.getMessage(), e);
         } finally {
@@ -63 +64 @@
     // Asynchronous operation
 
-    private String query;
-    private JsonQueryCallback callback;
-
-    private JsonQueryUtil() {}
+    private final String query;
+    private final JsonQueryCallback callback;
 
     private JsonQueryUtil(String query, JsonQueryCallback callback) {