Merge pull request #658 from Multiverse/fix/shutdown-executor

Ensure graceful shutdown for file IO executor service

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/inventories/profile/AsyncFileIO.java

@@ -2,19 +2,17 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import org.jvnet.hk2.annotations.Service;
-import org.mvplugins.multiverse.external.jakarta.inject.Inject;
+import org.mvplugins.multiverse.external.jakarta.annotation.PreDestroy;
 import org.mvplugins.multiverse.external.vavr.control.Try;
 
 import java.io.File;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 
 @Service
@@ -105,4 +103,20 @@ private void waitForLock(File file, CountDownLatch toWaitLatch) {
     ExecutorService getExecutor() {
         return fileIOExecutorService;
     }
+
+    @PreDestroy
+    private void completeRemainingTaskAndShutdown() {
+        fileIOExecutorService.shutdown();
+        try {
+            if (!fileIOExecutorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                fileIOExecutorService.shutdownNow();
+                if (!fileIOExecutorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                    Logging.severe("File IO executor did not terminate");
+                }
+            }
+        } catch (InterruptedException ie) {
+            fileIOExecutorService.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+    }
 }