Changeset 8635 in josm for trunk/src

Timestamp:

2015-08-02T11:53:28+02:00 (10 years ago)

Author:

wiktorn

Message:

Fix Coverity warnings:

• null pointer dereferences
• make maksimum time element may be taken from cache to one year

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• cache/JCSCachedTileLoaderJob.java (modified) (2 diffs)
• imagery/TMSCachedTileLoaderJob.java (modified) (1 diff)
• imagery/WMTSTileSource.java (modified) (1 diff)

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

@@ -53 +53 @@
     // Absolute expire time limit. Cached tiles that are older will not be used,
     // even if the refresh from the server fails.
-    protected static final long ABSOLUTE_EXPIRE_TIME_LIMIT = Long.MAX_VALUE; // unlimited
+    protected static final long ABSOLUTE_EXPIRE_TIME_LIMIT = 1000L * 60 * 60 * 24 * 365; // 1 year
 
     /**
@@ -455 +455 @@
             }
         }
+
         if (force) {
             urlConn.setUseCaches(false);

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

@@ -289 +289 @@
                     tile.finishLoading();
                 }
-                if (attributes.getResponseCode() >= 400) {
+                if (attributes != null && attributes.getResponseCode() >= 400) {
                     if (attributes.getErrorMessage() == null) {
                         tile.setError(tr("HTTP error {0} when loading tiles", attributes.getResponseCode()));

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

@@ -180 +180 @@
                 this.currentLayer = layerSelection.getSelectedLayer();
                 // TODO: save layer information into ImageryInfo / ImageryPreferences?
-            } else {
-                throw new IllegalArgumentException(tr("No layer selected")); //user canceled operation
-            }
+            }
+
+            if (this.currentLayer == null) {
+                // user canceled operation or did not choose any layer
+                throw new IllegalArgumentException(tr("No layer selected"));
+            }
+
         } else if (layers.size() == 1) {
             this.currentLayer = this.layers.iterator().next();