Changeset 8629 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-07-29T19:17:49+02:00 (9 years ago)

Author:

wiktorn

Message:

Fix NPE in CacheEntry and TMS settings

• fix NPE in CacheEntry (Closes: #11728)
• properly handle maximum concurrent downloads for TMS in settings

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/CacheEntry.java (modified) (1 diff)
• gui/preferences/imagery/TMSSettingsPanel.java (modified) (3 diffs)

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

@@ -26 +26 @@
      */
     public byte[] getContent() {
+        if (content == null) {
+            return new byte[]{};
+        }
         return Arrays.copyOf(content, content.length);
     }

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
-import org.openstreetmap.josm.data.imagery.TMSCachedTileLoaderJob;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.tools.GBC;
@@ -44 +43 @@
                 TMSLayer.PROP_MAX_ZOOM_LVL.get().intValue(), TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1));
         maxConcurrentDownloads = new JSpinner(new SpinnerNumberModel(
-                TMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1));
+                TMSCachedTileLoader.THREAD_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1));
         maxDownloadsPerHost = new JSpinner(new SpinnerNumberModel(
                 TMSCachedTileLoader.HOST_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1));
@@ -88 +87 @@
         this.maxZoomLvl.setValue(TMSLayer.getMaxZoomLvl(null));
         this.minZoomLvl.setValue(TMSLayer.getMinZoomLvl(null));
-        this.maxConcurrentDownloads.setValue(TMSCachedTileLoaderJob.THREAD_LIMIT.get());
+        this.maxConcurrentDownloads.setValue(TMSCachedTileLoader.THREAD_LIMIT.get());
         this.maxDownloadsPerHost.setValue(TMSCachedTileLoader.HOST_LIMIT.get());
     }