Changeset 12590 in josm for trunk/src/org/openstreetmap/josm/tools/HttpClient.java

Timestamp:

2017-08-11T09:59:03+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15133 - NPE at HttpClient.disconnect

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (1 diff)

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

@@ -654 +654 @@
 
     private static void disconnect(final HttpURLConnection connection) {
-        // Fix upload aborts - see #263
-        connection.setConnectTimeout(100);
-        connection.setReadTimeout(100);
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException ex) {
-            Main.warn("InterruptedException in " + HttpClient.class + " during cancel");
-            Thread.currentThread().interrupt();
-        }
-        connection.disconnect();
+        if (connection != null) {
+            // Fix upload aborts - see #263
+            connection.setConnectTimeout(100);
+            connection.setReadTimeout(100);
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ex) {
+                Main.warn("InterruptedException in " + HttpClient.class + " during cancel");
+                Thread.currentThread().interrupt();
+            }
+            connection.disconnect();
+        }
     }
 }