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

Timestamp:

2015-04-07T09:00:22+02:00 (11 years ago)

Author:

bastiK

Message:

see #11216 - fixes NPE when BingAttribution is not loaded, and for not showing tiles at overzoom (patch by wiktorn)

File:

• trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (modified) (8 diffs)

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

@@ -8 +8 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.net.URLConnection;
 import java.util.HashSet;
@@ -126 +127 @@
     public void submit(ICachedLoaderListener listener) {
         boolean first = false;
-        String url = getUrl().toString();
-        if (url == null) {
+        URL url = getUrl();
+        String deduplicationKey = null;
+        if (url != null) {
+            // url might be null, for example when Bing Attribution is not loaded yet
+            deduplicationKey = url.toString();
+        }
+        if (deduplicationKey == null) {
             log.log(Level.WARNING, "No url returned for: {0}, skipping", getCacheKey());
             return;
         }
         synchronized (inProgress) {
-            Set<ICachedLoaderListener> newListeners = inProgress.get(url);
+            Set<ICachedLoaderListener> newListeners = inProgress.get(deduplicationKey);
             if (newListeners == null) {
                 newListeners = new HashSet<>();
-                inProgress.put(url, newListeners);
+                inProgress.put(deduplicationKey, newListeners);
                 first = true;
             }
@@ -162 +168 @@
 
     /**
-     * 
+     *
      * @return checks if object from cache has sufficient data to be returned
      */
@@ -171 +177 @@
 
     /**
-     * 
+     *
      * @return cache object as empty, regardless of what remote resource has returned (ex. based on headers)
      */
@@ -264 +270 @@
     }
 
+    /**
+     * @return true if object was successfully downloaded, false, if there was a loading failure
+     */
+
     private boolean loadObject() {
         try {
@@ -316 +326 @@
                             new Object[] {getCacheKey(), raw.length, getUrl()});
                     return true;
-                } else {
+                } else  {
                     cacheData = createCacheEntry(new byte[]{});
                     cache.put(getCacheKey(), cacheData, attributes);
@@ -326 +336 @@
             log.log(Level.FINE, "JCS - Caching empty object as server returned 404 for: {0}", getUrl());
             cache.put(getCacheKey(), createCacheEntry(new byte[]{}), attributes);
-            handleNotFound();
-            return true;
+            return handleNotFound();
         } catch (Exception e) {
             log.log(Level.WARNING, "JCS - Exception during download " + getUrl(), e);
@@ -336 +345 @@
     }
 
-    protected abstract void handleNotFound();
+    /**
+     *  @return if we should treat this object as properly loaded
+     */
+    protected abstract boolean handleNotFound();
 
     protected abstract V createCacheEntry(byte[] content);