#2883: shutdown ExecutorService in a finally clause

objectionary · Feb 21, 2024 · 7dddfc7 · 7dddfc7
1 parent 77c3757
commit 7dddfc7
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java
@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 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;
@@ -327,8 +328,10 @@ protected final ForeignTojos scopedTojos() {
      * @throws TimeoutException If timeout limit reached
      */
     private void execWithTimeout() throws ExecutionException, TimeoutException {
+        ExecutorService service = null;
         try {
-            Executors.newSingleThreadExecutor().submit(
+            service = Executors.newSingleThreadExecutor();
+            service.submit(
                 () -> {
                     this.exec();
                     return new Object();
@@ -343,6 +346,10 @@ private void execWithTimeout() throws ExecutionException, TimeoutException {
                 ),
                 ex
             );
+        } finally {
+            if (service != null) {
+                service.shutdown();
+            }
         }
     }