Changeset 9185 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

Timestamp:

2015-12-28T01:42:36+01:00 (8 years ago)

Author:

simon04

Message:

see #12231 - HttpClient now reports status to ProgressMonitor

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (2 diffs)

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

@@ -131 +131 @@
 
             try {
-                activeConnection = client.connect();
+                activeConnection = client.connect(progressMonitor);
             } catch (Exception e) {
                 Main.error(e);
@@ -158 +158 @@
 
                 activeConnection.uncompressAccordingToContentDisposition(uncompressAccordingToContentDisposition);
-                InputStream in = new ProgressInputStream(activeConnection, progressMonitor);
-                return in;
+                return activeConnection.getContent();
             } catch (OsmTransferException e) {
                 throw e;