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

Timestamp:

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

Author:

simon04

Message:

see #12292 - Allow to disconnect HttpClient in connecting phase

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginDownloadTask.java (modified) (2 diffs)
• ReadRemotePluginInformationTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

@@ -44 +44 @@
     private final Collection<PluginInformation> downloaded = new LinkedList<>();
     private boolean canceled;
-    private HttpClient.Response downloadConnection;
+    private HttpClient downloadConnection;
 
     /**
@@ -124 +124 @@
             synchronized (this) {
                 downloadConnection = HttpClient.create(url)
-                        .setAccept(PLUGIN_MIME_TYPES)
-                        .connect();
-            }
-            try (InputStream in = downloadConnection.getContent()) {
+                        .setAccept(PLUGIN_MIME_TYPES);
+                downloadConnection.connect();
+            }
+            try (InputStream in = downloadConnection.getResponse().getContent()) {
                 Files.copy(in, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
             }

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -51 +51 @@
     private Collection<String> sites;
     private boolean canceled;
-    private HttpClient.Response connection;
+    private HttpClient connection;
     private List<PluginInformation> availablePlugins;
     private boolean displayErrMsg;
@@ -157 +157 @@
 
             URL url = new URL(site);
-            connection = HttpClient.create(url).useCache(false).connect();
-            content = connection.fetchContent();
-            if (connection.getResponseCode() != 200) {
+            connection = HttpClient.create(url).useCache(false);
+            final HttpClient.Response response = connection.connect();
+            content = response.fetchContent();
+            if (response.getResponseCode() != 200) {
                 throw new IOException(tr("Unsuccessful HTTP request"));
             }