Changeset 10302 in josm for trunk/src/org/openstreetmap/josm/tools/HttpClient.java

Timestamp:

2016-05-30T09:24:08+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12583 - fix unit tests by adding a new mode to HttpClient. Don't know if it's the best way to do it...

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -52 +52 @@
     private HttpURLConnection connection; // to allow disconnecting before `response` is set
     private Response response;
+    private boolean finishOnCloseOutput = true;
 
     static {
@@ -111 +112 @@
             connection.setDoOutput(true);
             try (OutputStream out = new BufferedOutputStream(
-                    new ProgressOutputStream(connection.getOutputStream(), requestBody.length, progressMonitor))) {
+                    new ProgressOutputStream(connection.getOutputStream(), requestBody.length, progressMonitor, finishOnCloseOutput))) {
                 out.write(requestBody);
             }
@@ -598 +599 @@
     }
 
+    /**
+     * Sets whether the progress monitor task will be finished when the output stream is closed. This is {@code true} by default.
+     * @param finishOnCloseOutput whether the progress monitor task will be finished when the output stream is closed
+     * @return {@code this}
+     * @since 10302
+     */
+    public HttpClient setFinishOnCloseOutput(boolean finishOnCloseOutput) {
+        this.finishOnCloseOutput = finishOnCloseOutput;
+        return this;
+    }
+
     private static boolean isRedirect(final int statusCode) {
         switch (statusCode) {