Changeset 977 in josm for trunk

Timestamp:

2008-09-16T19:44:32+02:00 (16 years ago)

Author:

stoecker

Message:

handle 412 as upload error. Closes #1316

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (3 diffs)

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

@@ -444 +444 @@
                         /* When creating new, the returned value is the new id, otherwise it is the new version */
                         if (retCode == 200)
+                        {
                                 if(osm.id == 0)
                                 {
@@ -455 +456 @@
                                                 osm.version = read_version;
                                 }
-                        System.out.println("got return: "+retCode+" with id "+osm.id);
-                        String retMsg = activeConnection.getResponseMessage();
+                        }
+                        else
+                        {
+                                System.out.println("got return: "+retCode+" with id "+osm.id);
+                        }
                         activeConnection.disconnect();
                         if (retCode == 410 && requestMethod.equals("DELETE"))
                                 return; // everything fine.. was already deleted.
-                        if (retCode != 200 && retCode != 412) {
-                                if (retries >= 0) {
+                        else if (retCode != 200)
+                        {
+                                if (retries >= 0 && retCode != 412)
+                                {
                                         retries--;
                                         System.out.print("backing off for 10 seconds...");
@@ -467 +473 @@
                                         System.out.println("retrying ("+retries+" left)");
                                         sendRequestRetry(requestMethod, urlSuffix, osm, body, retries);
-                                } else { 
+                                } else {
+                                        String retMsg = activeConnection.getResponseMessage();
                                         // Look for a detailed error message from the server
                                         if (activeConnection.getHeaderField("Error") != null)