Ticket #4145: 4145.patch

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

@@ -761 +761 @@
     protected final String sendRequest(String requestMethod, String urlSuffix, String requestBody, ProgressMonitor monitor,
             String contentType, boolean doAuthenticate, boolean fastFail) throws OsmTransferException {
         int retries = fastFail ? 0 : getMaxRetries();
+        if (monitor == null) {
+            monitor = NullProgressMonitor.INSTANCE;
+        }
 
         while (true) { // the retry loop
             try {
                 url = new URL(new URL(getBaseUrl()), urlSuffix);
                 final HttpClient client = HttpClient.create(url, requestMethod)
                         .keepAlive(false)
-                        .setAccept("application/xml, */*;q=0.8");
+                        .setAccept("application/xml, */*;q=0.8")
+                        .setFinishOnCloseOutput(false);
                 activeConnection = client;
                 if (fastFail) {
                     client.setConnectTimeout(1000);
@@ -791 +795 @@
                     client.setRequestBody((requestBody != null ? requestBody : "").getBytes(StandardCharsets.UTF_8));
                 }
 
-                final HttpClient.Response response = client.connect();
+                final HttpClient.Response response = client.connect(monitor.createSubTaskMonitor(1, false));
                 Logging.info(response.getResponseMessage());
                 int retCode = response.getResponseCode();