Changeset 11438 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-01-07T09:44:59+01:00 (8 years ago)

Author:

wiktorn

Message:

Fix thread pool for WMS

Because threds in WMS download ThreadPool never died, the unreferenced ThreadPool object (and its threads) was never cleared. To fix this minimum size of ThreadPool was changed to 0.

But due to the fact, that ThreadPoolExecutor spawns new Thread only when workQueue refuses to take a new job, workaround is implemented in HostLimitQueue based on: ​http://stackoverflow.com/questions/9622599/java-threadpoolexecutor-strategy-direct-handoff-with-queue#

WMS Settings was fixed so now WMS has it's own THREAD_LIMIT setting not connected to JCS default setting.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java (modified) (4 diffs)

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

@@ -13 +13 @@
 import javax.swing.SpinnerNumberModel;
 
-import org.openstreetmap.josm.data.imagery.WMSCachedTileLoaderJob;
+import org.openstreetmap.josm.data.imagery.WMSCachedTileLoader;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.tools.GBC;
@@ -49 +49 @@
         add(Box.createHorizontalGlue(), GBC.eol().fill(GBC.HORIZONTAL));
         JLabel labelSimConn = new JLabel(tr("Simultaneous connections:"));
-        int threadLimitValue = Utils.clamp(WMSCachedTileLoaderJob.THREAD_LIMIT.get(), THREADS_MIN, THREADS_MAX);
+        int threadLimitValue = Utils.clamp(WMSCachedTileLoader.THREAD_LIMIT.get(), THREADS_MIN, THREADS_MAX);
         spinSimConn = new JSpinner(new SpinnerNumberModel(threadLimitValue, THREADS_MIN, THREADS_MAX, 1));
         labelSimConn.setLabelFor(spinSimConn);
@@ -71 +71 @@
     public void loadSettings() {
         this.autozoomActive.setSelected(WMSLayer.PROP_DEFAULT_AUTOZOOM.get());
-        this.spinSimConn.setValue(WMSCachedTileLoaderJob.THREAD_LIMIT.get());
+        this.spinSimConn.setValue(WMSCachedTileLoader.THREAD_LIMIT.get());
         this.tileSize.setValue(WMSLayer.PROP_IMAGE_SIZE.get());
     }
@@ -81 +81 @@
     public boolean saveSettings() {
         WMSLayer.PROP_DEFAULT_AUTOZOOM.put(this.autozoomActive.isSelected());
-        WMSCachedTileLoaderJob.THREAD_LIMIT.put((Integer) spinSimConn.getModel().getValue());
+        WMSCachedTileLoader.THREAD_LIMIT.put((Integer) spinSimConn.getModel().getValue());
         WMSLayer.PROP_IMAGE_SIZE.put((Integer) this.tileSize.getModel().getValue());