Changeset 8389 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

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

Author:

wiktorn

Message:

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

File:

• trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified) (3 diffs)

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) {