Changeset 8389 in josm for trunk/src

Timestamp:

2015-05-17T22:48:00+02:00 (10 years ago)

Author:

wiktorn

Message:

addresses #11437 - properly pass information about errors during load from cache to upper layers

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• cache/CacheEntryAttributes.java (modified) (4 diffs)
• cache/JCSCachedTileLoaderJob.java (modified) (1 diff)
• imagery/TMSCachedTileLoaderJob.java (modified) (3 diffs)

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

@@ -20 +20 @@
     private static final String LAST_MODIFICATION = "lastModification";
     private static final String EXPIRATION_TIME = "expirationTime";
+    private static final String HTTP_RESPONSE_CODE = "httpResponceCode";
 
     /**
@@ -30 +31 @@
         attrs.put(LAST_MODIFICATION, "0");
         attrs.put(EXPIRATION_TIME, "0");
+        attrs.put(HTTP_RESPONSE_CODE, "200");
     }
 
@@ -46 +48 @@
 
     private long getLongAttr(String key) {
+        String val = attrs.get(key);
+        if (val == null) {
+            attrs.put(key,  "0");
+            return 0;
+        }
         try {
-            return Long.parseLong(attrs.get(key));
+            return Long.parseLong(val);
         } catch (NumberFormatException e) {
             attrs.put(key, "0");
@@ -67 +74 @@
     }
 
+    public void setResponseCode(int responseCode) {
+        attrs.put(HTTP_RESPONSE_CODE, Integer.toString(responseCode));
+    }
+
+    public int getResponseCode() {
+        return (int) getLongAttr(HTTP_RESPONSE_CODE);
+    }
+
 }

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

@@ -364 +364 @@
                     continue;
                 }
+
+                attributes.setResponseCode(urlConn.getResponseCode());
                 byte[] raw = read(urlConn);
 
                 if (!cacheAsEmpty(urlConn.getHeaderFields(), urlConn.getResponseCode(), raw) &&
                         raw != null && raw.length > 0) {
+                    // we need to check cacheEmpty, so for cases, when data is returned, but we want to store
+                    // as empty (eg. empty tile images) to save some space
                     cacheData = createCacheEntry(raw);
                     cache.put(getCacheKey(), cacheData, attributes);

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.ByteArrayInputStream;
@@ -273 +275 @@
                         }
                     }
+                    int httpStatusCode = attributes.getResponseCode();
+                    if (!isNoTileAtZoom() && httpStatusCode >= 400) {
+                        tile.setError(tr("HTTP error {0} when loading tiles", httpStatusCode));
+                    }
                     // no break intentional here
                 case REJECTED:
@@ -313 +319 @@
                     tile.finishLoading();
                 }
+                if (attributes.getResponseCode() >= 400) {
+                    tile.setError(tr("HTTP error {0} when loading tiles", attributes.getResponseCode()));
+                }
                 return tile;
             } catch (IOException e) {