Interrupt all running tasks during shutdown

CHANGELOG.md

@@ -20,6 +20,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Fixed
 
+- We fixed an issue where the `.sav` file was not deleted upon exiting JabRef. [#6109](https://github.com/JabRef/jabref/issues/6109)
+
 ### Removed
 
 

src/main/java/org/jabref/JabRefExecutorService.java

@@ -132,13 +132,47 @@ public void submit(TimerTask timerTask, long millisecondsDelay) {
         timer.schedule(timerTask, millisecondsDelay);
     }
 
+    /**
+     * Shuts everything down. Upon termination, this method returns.
+     */
     public void shutdownEverything() {
-        // those threads will be allowed to finish
-        this.executorService.shutdown();
-        // those threads will be interrupted in their current task
-        this.lowPriorityExecutorService.shutdownNow();
         // kill the remote thread
         stopRemoteThread();
+
+        try {
+            // those threads will be allowed to finish
+            this.executorService.shutdown();
+            if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                LOGGER.debug("One minute passed, saving still not completed. Trying forced shutdown.");
+                executorService.shutdownNow();
+                if (executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                    LOGGER.debug("One minute passed again - forced shutdown worked.");
+                } else {
+                    LOGGER.error("DelayedTaskThrottler did not terminate");
+                }
+            }
+        } catch (InterruptedException ie) {
+                executorService.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+
+        try {
+            // those threads will be interrupted in their current task
+            this.lowPriorityExecutorService.shutdownNow();
+            if (!lowPriorityExecutorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                LOGGER.debug("One minute passed, saving still not completed. Trying forced shutdown.");
+                lowPriorityExecutorService.shutdownNow();
+                if (lowPriorityExecutorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                    LOGGER.debug("One minute passed again - forced shutdown worked.");
+                } else {
+                    LOGGER.error("DelayedTaskThrottler did not terminate");
+                }
+            }
+        } catch (InterruptedException ie) {
+            lowPriorityExecutorService.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+
         timer.cancel();
     }
 

src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java

@@ -122,6 +122,9 @@ public <V> Future<?> schedule(BackgroundTask<V> task, long delay, TimeUnit unit)
         return scheduledExecutor.schedule(getJavaFXTask(task), delay, unit);
     }
 
+    /**
+     * Shuts everything down. Upon termination, this method returns.
+     */
     @Override
     public void shutdown() {
         executor.shutdownNow();

src/main/java/org/jabref/logic/util/DelayTaskThrottler.java

@@ -32,6 +32,7 @@ public DelayTaskThrottler(int delay) {
         this.delay = delay;
         this.executor = new ScheduledThreadPoolExecutor(1);
         this.executor.setRemoveOnCancelPolicy(true);
+        this.executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
     }
 
     public void schedule(Runnable command) {
@@ -45,7 +46,25 @@ public void schedule(Runnable command) {
         }
     }
 
+    /**
+     * Shuts everything down. Upon termination, this method returns.
+     */
     public void shutdown() {
+        // this is non-blocking. See https://stackoverflow.com/a/57383461/873282.
         executor.shutdown();
+        try {
+            if (!executor.awaitTermination(60, TimeUnit.SECONDS)) {
+                LOGGER.debug("One minute passed, saving still not completed. Trying forced shutdown.");
+                executor.shutdownNow();
+                if (executor.awaitTermination(60, TimeUnit.SECONDS)) {
+                    LOGGER.debug("One minute passed again - forced shutdown worked.");
+                } else {
+                    LOGGER.error("DelayedTaskThrottler did not terminate");
+                }
+            }
+        } catch (InterruptedException ie) {
+            executor.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
     }
 }