Changeset 216 in josm

Timestamp:

2007-04-10T14:37:17+02:00 (17 years ago)

Author:

imi

Message:

• added nicer error messages from OSM server (thanks "anonymous" from ticket #126)

Location:

src/org/openstreetmap/josm/io

Files:

• OsmServerWriter.java (modified) (2 diffs)
• ProgressInputStream.java (modified) (1 diff)

src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -150 +150 @@
          *              <code>false</code>, if only the id is encoded.
          */
-        @SuppressWarnings("unchecked")
         private void sendRequest(String requestMethod, String urlSuffix,
                         OsmPrimitive osm, boolean addBody) {
@@ -183 +182 @@
                                 return; // everything fine.. was already deleted.
                         if (retCode != 200) {
+                                // Look for a detailed error message from the server
+                                if (activeConnection.getHeaderField("Error") != null)
+                                        retMsg += "\n" + activeConnection.getHeaderField("Error");
+
+                                // Report our error
                                 ByteArrayOutputStream o = new ByteArrayOutputStream();
                                 OsmWriter.output(o, new OsmWriter.Single(osm, true));

src/org/openstreetmap/josm/io/ProgressInputStream.java

@@ -19 +19 @@
         private PleaseWaitDialog pleaseWaitDlg;
 
-        public ProgressInputStream(URLConnection con, PleaseWaitDialog pleaseWaitDlg) throws IOException {
+        public class OsmServerException extends IOException {
+                private OsmServerException(String e) {
+                        super(e);
+                }
+        }
+
+        public ProgressInputStream(URLConnection con, PleaseWaitDialog pleaseWaitDlg) throws IOException, OsmServerException {
                 this.connection = con;
-                this.in = con.getInputStream();
+
+                try {
+                        this.in = con.getInputStream();
+                } catch (IOException e) {
+                        if (con.getHeaderField("Error") != null)
+                                throw new OsmServerException(con.getHeaderField("Error"));
+                        throw e;
+                }
+
                 int contentLength = con.getContentLength();
                 this.pleaseWaitDlg = pleaseWaitDlg;