Merge pull request #16617 from iterate-ch/bugfix/MD-22686

No graceful shutdown of timer threads on disconnect.

Author: dkocher

brick/src/main/java/ch/cyberduck/core/brick/BrickFileMigrationFeature.java

@@ -100,7 +100,7 @@ public void uncaughtException(final Thread t, final Throwable e) {
             }
         }
         finally {
-            scheduler.shutdown();
+            scheduler.shutdown(true);
         }
     }
 

brick/src/main/java/ch/cyberduck/core/brick/BrickPairingSchedulerFeature.java

@@ -170,6 +170,6 @@ public JsonObject handleEntity(final HttpEntity entity) throws IOException {
     }
 
     public void shutdown() {
-        scheduler.shutdown();
+        scheduler.shutdown(true);
     }
 }

core/src/main/java/ch/cyberduck/core/features/Scheduler.java

@@ -34,5 +34,5 @@ public interface Scheduler<R> {
     /**
      * Shutdown thread pool
      */
-    void shutdown();
+    void shutdown(boolean gracefully);
 }

core/src/main/java/ch/cyberduck/core/shared/DelegatingSchedulerFeature.java

@@ -45,9 +45,9 @@ public Future<Void> execute(final PasswordCallback callback) {
     }
 
     @Override
-    public void shutdown() {
+    public void shutdown(final boolean gracefully) {
         for(Scheduler scheduler : features) {
-            scheduler.shutdown();
+            scheduler.shutdown(gracefully);
         }
     }
 }

core/src/main/java/ch/cyberduck/core/shared/ThreadPoolSchedulerFeature.java

@@ -50,9 +50,9 @@ public Future<R> execute(final PasswordCallback callback) {
     protected abstract R operate(PasswordCallback callback) throws BackgroundException;
 
     @Override
-    public void shutdown() {
+    public void shutdown(final boolean gracefully) {
         log.debug("Shutting down scheduler thread pool {}", this);
-        scheduler.shutdown();
+        scheduler.shutdown(gracefully);
     }
 
     private final class FailureAwareRunnable implements Runnable {
@@ -72,7 +72,7 @@ public void run() {
             }
             catch(Exception e) {
                 log.error("Failure processing scheduled task {}", e.getMessage(), e);
-                ThreadPoolSchedulerFeature.this.shutdown();
+                ThreadPoolSchedulerFeature.this.shutdown(false);
             }
         }
     }

core/src/main/java/ch/cyberduck/core/threading/ScheduledThreadPool.java

@@ -96,9 +96,15 @@ public ScheduledFuture<?> schedule(final Runnable runnable, final Long delay, fi
         return pool.schedule(runnable, delay, unit);
     }
 
-    public void shutdown() {
-        log.info("Shutdown pool {}", pool);
-        pool.shutdown();
+    public void shutdown(final boolean gracefully) {
+        if(gracefully) {
+            log.info("Shutdown pool {} gracefully", pool);
+            pool.shutdown();
+        }
+        else {
+            log.info("Shutdown pool {} now", pool);
+            pool.shutdownNow();
+        }
         try {
             while(!pool.awaitTermination(1L, TimeUnit.SECONDS)) {
                 log.warn("Await termination for pool {}", pool);

core/src/main/java/ch/cyberduck/core/threading/TransferBackgroundAction.java

@@ -180,7 +180,7 @@ public void finish() {
         progressTimer.cancel(false);
         transfer.stop();
         listener.transferDidStop(transfer);
-        timerPool.shutdown();
+        timerPool.shutdown(true);
     }
 
     @Override

deepbox/src/main/java/ch/cyberduck/core/deepbox/DeepboxReadFeature.java

@@ -130,7 +130,7 @@ public void uncaughtException(final Thread t, final Throwable e) {
             }
         }
         finally {
-            scheduler.shutdown();
+            scheduler.shutdown(true);
         }
     }
 

dracoon/src/main/java/ch/cyberduck/core/sds/SDSSession.java

@@ -587,7 +587,7 @@ public int hashCode() {
 
     @Override
     protected void logout() {
-        scheduler.shutdown();
+        scheduler.shutdown(false);
         client.getHttpClient().close();
         nodeid.clear();
     }

dracoon/src/main/java/ch/cyberduck/core/sds/SDSUploadService.java

@@ -276,7 +276,7 @@ public void uncaughtException(final Thread t, final Throwable e) {
                 throw new DefaultExceptionMappingService().map(Throwables.getRootCause(e));
             }
         }
-        polling.shutdown();
+        polling.shutdown(true);
         log.debug("Polling completed for {} with {} polls in {}ms ", file, polls.get(), System.currentTimeMillis() - start);
         if(null != failure.get()) {
             throw failure.get();