Changeset 10545 in josm for trunk/src/org/openstreetmap/josm/data/cache

Timestamp:

2016-07-17T12:40:18+02:00 (8 years ago)

Author:

wiktorn

Message:

Use stale cache tiles if IOException occurs

• small pretty print fixes (MemoryTileCache, TileSet)
• increase TileCache estimate (to accomodate larger TileSet's traverses when in offline mode)
• fix TileSet computations, sometimes it generated tileset of size 2 instead of 4 (for tiles inside the tile)

Closes: #13128

File:

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

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

@@ -387 +387 @@
         } catch (IOException e) {
             log.log(Level.FINE, "JCS - IOExecption during communication with server for: {0}", getUrlNoException());
-            attributes.setError(e);
-            attributes.setResponseCode(499); // set dummy error code
-            boolean doCache = isResponseLoadable(null, 499, null) || cacheAsEmpty(); //generic 499 error code returned
-            if (doCache) {
-                cacheData = createCacheEntry(new byte[]{});
-                cache.put(getCacheKey(), createCacheEntry(new byte[]{}), attributes);
-            }
-            return doCache;
+            if (isObjectLoadable()) {
+                return true;
+            } else {
+                attributes.setError(e);
+                attributes.setResponseCode(499); // set dummy error code
+                boolean doCache = isResponseLoadable(null, 499, null) || cacheAsEmpty(); //generic 499 error code returned
+                if (doCache) {
+                    cacheData = createCacheEntry(new byte[]{});
+                    cache.put(getCacheKey(), createCacheEntry(new byte[]{}), attributes);
+                }
+                return doCache;
+            }
+
         } catch (InterruptedException e) {
             attributes.setError(e);