Use new threads API

[signal-cli] / src / main / java / org / asamk / signal / util / Util.java

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index e193d25330b7843fe9b67ef8c933fef8d7882045..63717ec031b9071ea669e8c2dd3e3191a34a7c8d 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -16,8 +16,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;

-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;

 import java.util.stream.Collectors;
 
 public class Util {
 import java.util.stream.Collectors;
 
 public class Util {


@@ -86,19 +84,4 @@ public class Util {
         }
         return map;
     }
         }
         return map;
     }

-
-    public static void closeExecutorService(ExecutorService executor) {
-        executor.shutdown();
-        try {
-            if (!executor.awaitTermination(5, TimeUnit.MINUTES)) {
-                executor.shutdownNow();
-                if (!executor.awaitTermination(1, TimeUnit.MINUTES)) {
-                    logger.warn("Failed to shutdown executor service");
-                }
-            }
-        } catch (InterruptedException e) {
-            executor.shutdownNow();
-            Thread.currentThread().interrupt();
-        }
-    }

 }
 }