Changeset 8643 in josm for trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

Timestamp:

2015-08-05T23:51:30+02:00 (9 years ago)

Author:

wiktorn

Message:

Fix behaviour when exception is thrown during download.

• fix endless download, when exception is thrown during download
• draw multiline error text on tile if error string is longer than tile width

File:

• trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -276 +276 @@
                 return false;
             }
-        } else {
+        } else if (attributes.getLastModification() > 0 &&
+                now - attributes.getLastModification() > DEFAULT_EXPIRE_TIME) {
             // check by file modification date
-            if (now - attributes.getLastModification() > DEFAULT_EXPIRE_TIME) {
-                log.log(Level.FINE, "JCS - Object has expired, maximum file age reached {0}", getUrl());
-                return false;
-            }
+            log.log(Level.FINE, "JCS - Object has expired, maximum file age reached {0}", getUrl());
+            return false;
+        } else if (now - attributes.getCreateTime() > DEFAULT_EXPIRE_TIME) {
+            log.log(Level.FINE, "JCS - Object has expired, maximum time since object creation reached {0}", getUrl());
+            return false;
         }
         return true;