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

Timestamp:

2016-12-14T15:50:53+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2259 - Null pointers should not be dereferenced

File:

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

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

@@ -213 +213 @@
      */
     protected String getServerKey() {
-        return getUrlNoException().getHost();
+        try {
+            return getUrl().getHost();
+        } catch (IOException e) {
+            Main.trace(e);
+            return null;
+        }
     }
 
@@ -255 +260 @@
         Set<ICachedLoaderListener> listeners;
         synchronized (inProgress) {
-            listeners = inProgress.remove(getUrlNoException().toString());
+            try {
+                listeners = inProgress.remove(getUrl().toString());
+            } catch (IOException e) {
+                listeners = null;
+                Main.trace(e);
+            }
         }
         if (listeners == null) {