Changeset 1859 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-07-27T08:17:38+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3053: missing api handler for "Internal Server Error"

File:

• trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) (4 diffs)

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

@@ -355 +355 @@
 
     private void sleepAndListen() throws OsmTransferCancelledException {
-        // System.out.print("backing off for 10 seconds...");
+        System.out.print(tr("Waiting 10 seconds ... "));
         for(int i=0; i < 10; i++) {
             if (cancel || isAuthCancelled())
@@ -363 +363 @@
             } catch (InterruptedException ex) {}
         }
+        System.out.println(tr("OK - trying again."));
+    }
+
+    /**
+     * Replies the max. number of retries in case of 5XX errors on the server
+     * 
+     * @return the max number of retries
+     */
+    protected int getMaxRetries() {
+        int ret = Main.pref.getInteger("osm-server.max-num-retries", DEFAULT_MAX_NUM_RETRIES);
+        return Math.max(ret,0);
     }
 
@@ -385 +396 @@
         StringBuffer responseBody = new StringBuffer();
 
-        int retries = Main.pref.getInteger("osm-server.max-num-retries", DEFAULT_MAX_NUM_RETRIES);
-        retries = Math.max(0,retries);
+        int retries = getMaxRetries();
 
         while(true) { // the retry loop
@@ -423 +433 @@
                     if (retries-- > 0) {
                         sleepAndListen();
+                        int maxRetries = getMaxRetries();
+                        System.out.println(tr("Starting retry {0} of {1}.", maxRetries - retries,maxRetries));
                         continue;
                     }