Changeset 9309 in josm for trunk/src/org/openstreetmap/josm/io/OsmApi.java

Timestamp:

2016-01-04T20:51:45+01:00 (11 years ago)

Author:

simon04

Message:

see #12292 - Allow to disconnect HttpClient in connecting phase

File:

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

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

@@ -618 +618 @@
                 url = new URL(new URL(getBaseUrl()), urlSuffix);
                 final HttpClient client = HttpClient.create(url, requestMethod).keepAlive(false);
+                activeConnection = client;
                 if (fastFail) {
                     client.setConnectTimeout(1000);
@@ -640 +641 @@
                 }
 
-                activeConnection = client.connect();
-                Main.info(activeConnection.getResponseMessage());
-                int retCode = activeConnection.getResponseCode();
+                final HttpClient.Response response = client.connect();
+                Main.info(response.getResponseMessage());
+                int retCode = response.getResponseCode();
 
                 if (retCode >= 500) {
@@ -652 +653 @@
                 }
 
-                final String responseBody = activeConnection.fetchContent();
+                final String responseBody = response.fetchContent();
 
                 String errorHeader = null;
                 // Look for a detailed error message from the server
-                if (activeConnection.getHeaderField("Error") != null) {
-                    errorHeader = activeConnection.getHeaderField("Error");
+                if (response.getHeaderField("Error") != null) {
+                    errorHeader = response.getHeaderField("Error");
                     Main.error("Error header: " + errorHeader);
                 } else if (retCode != HttpURLConnection.HTTP_OK && responseBody.length() > 0) {