Changeset 9182 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-12-27T22:01:58+01:00 (9 years ago)

Author:

simon04

Message:

see #12231 - No read timeout for OsmApi connections

Fixes regression from r9172

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/OsmApi.java (modified) (3 diffs)
• tools/HttpClient.java (modified) (2 diffs)

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

@@ -619 +619 @@
                 final HttpClient client = HttpClient.create(url, requestMethod).keepAlive(false);
                 if (fastFail) {
+                    client.setConnectTimeout(1000);
                     client.setReadTimeout(1000);
+                } else {
+                    // use default connect timeout from org.openstreetmap.josm.tools.HttpClient.connectTimeout
+                    client.setReadTimeout(0);
                 }
                 if (doAuthenticate) {
@@ -626 +630 @@
 
                 if ("PUT".equals(requestMethod) || "POST".equals(requestMethod) || "DELETE".equals(requestMethod)) {
+                    client.setHeader("Content-Type", "text/xml");
                     // It seems that certain bits of the Ruby API are very unhappy upon
                     // receipt of a PUT/POST message without a Content-length header,
@@ -632 +637 @@
                     // we use the output stream, we create an output stream for PUT/POST
                     // even if there is no payload.
-                    client.setRequestBody(requestBody.getBytes(StandardCharsets.UTF_8));
+                    client.setRequestBody((requestBody != null ? requestBody : "").getBytes(StandardCharsets.UTF_8));
                 }
 

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

@@ -92 +92 @@
 
         if ("PUT".equals(requestMethod) || "POST".equals(requestMethod) || "DELETE".equals(requestMethod)) {
+            Main.info("{0} {1} ({2} kB) ...", requestMethod, url, requestBody.length / 1024);
             headers.put("Content-Length", String.valueOf(requestBody.length));
             connection.setDoOutput(true);
@@ -112 +113 @@
                 }
             } catch (IOException e) {
+                Main.warn(e);
                 //noinspection ThrowableResultOfMethodCallIgnored
                 Main.addNetworkError(url, Utils.getRootCause(e));