Fix isShutdown() always return true (#1426)

apache · May 9, 2018 · 0592e84 · 0592e84
1 parent 04c93e8
commit 0592e84
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ExecutorUtil.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ExecutorUtil.java
@@ -34,17 +34,17 @@ public class ExecutorUtil {
             new LinkedBlockingQueue<Runnable>(100),
             new NamedThreadFactory("Close-ExecutorService-Timer", true));
 
-    public static boolean isShutdown(Executor executor) {
+    public static boolean isTerminated(Executor executor) {
         if (executor instanceof ExecutorService) {
-            if (((ExecutorService) executor).isShutdown()) {
+            if (((ExecutorService) executor).isTerminated()) {
                 return true;
             }
         }
         return false;
     }
 
     public static void gracefulShutdown(Executor executor, int timeout) {
-        if (!(executor instanceof ExecutorService) || isShutdown(executor)) {
+        if (!(executor instanceof ExecutorService) || isTerminated(executor)) {
             return;
         }
         final ExecutorService es = (ExecutorService) executor;
@@ -63,13 +63,13 @@ public static void gracefulShutdown(Executor executor, int timeout) {
             es.shutdownNow();
             Thread.currentThread().interrupt();
         }
-        if (!isShutdown(es)) {
+        if (!isTerminated(es)) {
             newThreadToCloseExecutor(es);
         }
     }
 
     public static void shutdownNow(Executor executor, final int timeout) {
-        if (!(executor instanceof ExecutorService) || isShutdown(executor)) {
+        if (!(executor instanceof ExecutorService) || isTerminated(executor)) {
             return;
         }
         final ExecutorService es = (ExecutorService) executor;
@@ -85,13 +85,13 @@ public static void shutdownNow(Executor executor, final int timeout) {
         } catch (InterruptedException ex) {
             Thread.currentThread().interrupt();
         }
-        if (!isShutdown(es)) {
+        if (!isTerminated(es)) {
             newThreadToCloseExecutor(es);
         }
     }
 
     private static void newThreadToCloseExecutor(final ExecutorService es) {
-        if (!isShutdown(es)) {
+        if (!isTerminated(es)) {
             shutdownExecutor.execute(new Runnable() {
                 @Override
                 public void run() {