Changeset 4128 in josm for trunk/src/org

Timestamp:

2011-06-08T09:06:48+02:00 (13 years ago)

Author:

stoecker

Message:

mirrored data is used twice as long in case of loading errors

File:

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

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

@@ -183 +183 @@
     private File checkLocal(URL url, String destDir, long maxTime) throws IOException {
         String prefKey = getPrefKey(url, destDir);
+        long age = 0L;
         File file = null;
         // FIXME: replace with normal getCollection after july 2011
@@ -195 +196 @@
                     maxTime = Main.pref.getInteger("mirror.maxtime", 7*24*60*60);
                 }
-                if (System.currentTimeMillis() - Long.parseLong(lp[0]) < maxTime*1000) {
+                age = System.currentTimeMillis() - Long.parseLong(lp[0]);
+                if (age < maxTime*1000) {
                     return file;
                 }
@@ -231 +233 @@
             Main.pref.putCollection(prefKey, Arrays.asList(new String[]
             {Long.toString(System.currentTimeMillis()), file.toString()}));
+        } catch (IOException e) {
+            if (age > maxTime*1000 && age < maxTime*1000*2) {
+                System.out.println(tr("Failed to load {0}, use cached file and retry next time: {1}",
+                url, e));
+                return file;
+            } else {
+                throw e;
+            }
         } finally {
             if (bis != null) {