Changeset 10877 in josm

Timestamp:

2016-08-23T00:45:29+02:00 (8 years ago)

Author:

Don-vip

Message:

see #13416 - add parameter validation do detect NPE origin

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• cache/JCSCachedTileLoaderJob.java (modified) (2 diffs)
• imagery/TMSCachedTileLoader.java (modified) (3 diffs)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.cache.ICachedLoaderListener.LoadResult;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Utils;
@@ -109 +110 @@
             Map<String, String> headers,
             ThreadPoolExecutor downloadJobExecutor) {
-
+        CheckParameterUtil.ensureParameterNotNull(cache, "cache");
         this.cache = cache;
         this.now = System.currentTimeMillis();

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.cache.HostLimitQueue;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -43 +44 @@
     public static final IntegerProperty HOST_LIMIT = new IntegerProperty("imagery.tms.tmsloader.maxjobsperhost", 6);
 
-
     /**
      * separate from JCS thread pool for TMS loader, so we can have different thread pools for default JCS
@@ -64 +64 @@
     public TMSCachedTileLoader(TileLoaderListener listener, ICacheAccess<String, BufferedImageCacheEntry> cache,
             int connectTimeout, int readTimeout, Map<String, String> headers) throws IOException {
+        CheckParameterUtil.ensureParameterNotNull(cache, "cache");
         this.cache = cache;
         this.connectTimeout = connectTimeout;