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

Timestamp:

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

Author:

simon04

Message:

see #12292 - Allow to disconnect HttpClient in connecting phase

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApi.java (modified) (3 diffs)
• OsmConnection.java (modified) (1 diff)
• OsmServerReader.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) {

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

@@ -31 +31 @@
 public class OsmConnection {
     protected boolean cancel;
-    protected HttpClient.Response activeConnection;
+    protected HttpClient activeConnection;
     protected OAuthParameters oauthParameters;
 

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

@@ -123 +123 @@
 
             final HttpClient client = HttpClient.create(url);
+            activeConnection = client;
             client.setReasonForRequest(reason);
             adaptRequest(client);
@@ -131 +132 @@
                 throw new OsmTransferCanceledException("Operation canceled");
 
+            final HttpClient.Response response;
             try {
-                activeConnection = client.connect(progressMonitor);
+                response = client.connect(progressMonitor);
             } catch (Exception e) {
                 Main.error(e);
@@ -141 +143 @@
             }
             try {
-                if (activeConnection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
+                if (response.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
                     throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED, null, null);
 
-                if (activeConnection.getResponseCode() == HttpURLConnection.HTTP_PROXY_AUTH)
+                if (response.getResponseCode() == HttpURLConnection.HTTP_PROXY_AUTH)
                     throw new OsmTransferCanceledException("Proxy Authentication Required");
 
-                if (activeConnection.getResponseCode() != HttpURLConnection.HTTP_OK) {
-                    String errorHeader = activeConnection.getHeaderField("Error");
+                if (response.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                    String errorHeader = response.getHeaderField("Error");
                     String errorBody;
                     try {
-                        errorBody = activeConnection.fetchContent();
+                        errorBody = response.fetchContent();
                     } catch (Exception e) {
                         errorBody = tr("Reading error text failed.");
                     }
-                    throw new OsmApiException(activeConnection.getResponseCode(), errorHeader, errorBody, url.toString());
+                    throw new OsmApiException(response.getResponseCode(), errorHeader, errorBody, url.toString());
                 }
 
-                activeConnection.uncompressAccordingToContentDisposition(uncompressAccordingToContentDisposition);
-                return activeConnection.getContent();
+                response.uncompressAccordingToContentDisposition(uncompressAccordingToContentDisposition);
+                return response.getContent();
             } catch (OsmTransferException e) {
                 throw e;