Changeset 3511 in josm for trunk/src/org

Timestamp:

2010-09-03T23:12:56+02:00 (14 years ago)

Author:

stoecker

Message:

fix #5410 - server error message hidden from user

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApiException.java (modified) (1 diff)
• OsmServerReader.java (modified) (4 diffs)

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

@@ -61 +61 @@
         sb.append("ResponseCode=")
         .append(responseCode);
-        if (errorHeader != null && errorBody != null && !errorBody.trim().equals("")) {
-            sb.append(", Error Header=<")
-            .append(tr(errorHeader))
-            .append(">");
-        }
-        if (errorBody != null && !errorBody.trim().equals("")) {
-            errorBody = errorBody.trim();
-            if(!errorBody.equals(errorHeader)) {
-                sb.append(", Error Body=<")
-                .append(tr(errorBody))
+        String eh = "";
+        try
+        {
+            if(errorHeader != null)
+                eh = tr(errorHeader.trim());
+            if (!eh.isEmpty()) {
+                sb.append(", Error Header=<")
+                .append(eh)
                 .append(">");
             }
+        }
+        catch (Exception e) {
+        }
+        try
+        {
+            String eb = errorBody != null ? tr(errorBody.trim()) : "";
+            if (!eb.isEmpty() && !eb.equals(eh)) {
+                sb.append(", Error Body=<")
+                .append(eb)
+                .append(">");
+            }
+        }
+        catch (Exception e) {
         }
         return sb.toString();

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

@@ -5 +5 @@
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -94 +95 @@
                     throw new OsmTransferCancelledException();
 
+                String encoding = activeConnection.getContentEncoding();
                 if (activeConnection.getResponseCode() != HttpURLConnection.HTTP_OK) {
                     String errorHeader = activeConnection.getHeaderField("Error");
-                    InputStream i = null;
-                    i = activeConnection.getErrorStream();
                     StringBuilder errorBody = new StringBuilder();
-                    if (i != null) {
-                        BufferedReader in = new BufferedReader(new InputStreamReader(i));
-                        String s;
-                        while((s = in.readLine()) != null) {
-                            errorBody.append(s);
-                            errorBody.append("\n");
+                    try
+                    {
+                        InputStream i = FixEncoding(activeConnection.getErrorStream(), encoding);
+                        if (i != null) {
+                            BufferedReader in = new BufferedReader(new InputStreamReader(i));
+                            String s;
+                            while((s = in.readLine()) != null) {
+                                errorBody.append(s);
+                                errorBody.append("\n");
+                            }
                         }
+                    }
+                    catch(Exception e) {
+                        errorBody.append(tr("Reading error text failed."));
                     }
 
@@ -111 +118 @@
                 }
 
-                String encoding = activeConnection.getContentEncoding();
-                InputStream inputStream = new ProgressInputStream(activeConnection, progressMonitor);
-                if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
-                    inputStream = new GZIPInputStream(inputStream);
-                }
-                else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
-                    inputStream = new InflaterInputStream(inputStream, new Inflater(true));
-                }
-                return inputStream;
+                return FixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
             } catch(Exception e) {
                 if (e instanceof OsmTransferException)
@@ -130 +129 @@
             progressMonitor.invalidate();
         }
+    }
+
+    private InputStream FixEncoding(InputStream stream, String encoding) throws IOException
+    {
+        if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
+            stream = new GZIPInputStream(stream);
+        }
+        else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
+            stream = new InflaterInputStream(stream, new Inflater(true));
+        }
+        return stream;
     }