Changeset 8412 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2015-05-22T01:06:28+02:00 (9 years ago)

Author:

Don-vip

Message:

ExecutorService field doesn't ever get shutdown

File:

• trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -434 +434 @@
     protected class SaveAndUploadTask implements Runnable {
 
-        private SaveLayersModel model;
-        private ProgressMonitor monitor;
-        private ExecutorService worker;
+        private final SaveLayersModel model;
+        private final ProgressMonitor monitor;
+        private final ExecutorService worker;
         private boolean canceled;
         private Future<?> currentFuture;
@@ -592 +592 @@
                 }
             });
+            worker.shutdownNow();
         }
 
@@ -598 +599 @@
                 currentTask.cancel();
             }
+            worker.shutdown();
             canceled = true;
         }