Changeset 10420 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-06-18T19:54:45+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S1166 - Exception handlers should preserve the original exceptions

File:

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

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

@@ -160 +160 @@
                 if (response.getResponseCode() != HttpURLConnection.HTTP_OK) {
                     String errorHeader = response.getHeaderField("Error");
-                    String errorBody;
-                    try {
-                        errorBody = response.fetchContent();
-                    } catch (IOException e) {
-                        errorBody = tr("Reading error text failed.");
-                    }
+                    String errorBody = fetchResponseText(response);
                     throw new OsmApiException(response.getResponseCode(), errorHeader, errorBody, url.toString());
                 }
@@ -178 +173 @@
         } finally {
             progressMonitor.invalidate();
+        }
+    }
+
+    private static String fetchResponseText(final HttpClient.Response response) {
+        try {
+            return response.fetchContent();
+        } catch (IOException e) {
+            Main.error(e);
+            return tr("Reading error text failed.");
         }
     }