Changeset 9184 in josm for trunk

Timestamp:

2015-12-28T00:02:30+01:00 (8 years ago)

Author:

simon04

Message:

see #12231 - fix MultiFetchServerObjectReaderTest#multiGetWithNonExistingNode

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/OsmServerReader.java (modified) (1 diff)
• tools/HttpClient.java (modified) (1 diff)

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

@@ -148 +148 @@
                 if (activeConnection.getResponseCode() != HttpURLConnection.HTTP_OK) {
                     String errorHeader = activeConnection.getHeaderField("Error");
-                    final String errorBody = activeConnection.fetchContent();
+                    String errorBody;
+                    try {
+                        errorBody = activeConnection.fetchContent();
+                    } catch (Exception e) {
+                        errorBody = tr("Reading error text failed.");
+                    }
                     throw new OsmApiException(activeConnection.getResponseCode(), errorHeader, errorBody, url.toString());
                 }

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

@@ -104 +104 @@
             try {
                 connection.connect();
-                if (reasonForRequest != null && "".equalsIgnoreCase(reasonForRequest)) {
-                    Main.info("{0} {1} ({2}) -> {3}", requestMethod, url, reasonForRequest, connection.getResponseCode());
-                } else {
-                    Main.info("{0} {1} -> {2}", requestMethod, url, connection.getResponseCode());
-                }
+                final boolean hasReason = reasonForRequest != null && "".equalsIgnoreCase(reasonForRequest);
+                Main.info("{0} {1}{2} -> {3}{4}",
+                        requestMethod, url, hasReason ? " (" + reasonForRequest + ")" : "",
+                        connection.getResponseCode(),
+                        connection.getContentLengthLong() > 0 ? " (" + connection.getContentLengthLong() / 1024 + "KB)" : ""
+                );
                 if (Main.isDebugEnabled()) {
                     Main.debug("RESPONSE: " + connection.getHeaderFields());
                 }
             } catch (IOException e) {
+                Main.info("{0} {1} -> !!!", requestMethod, url);
                 Main.warn(e);
                 //noinspection ThrowableResultOfMethodCallIgnored