Merge branch '3.2' of https://github.com/apache/dubbo into 3.2

apache · Jan 9, 2024 · edf00b3 · edf00b3
2 parents 20e0b57 + 670f997
commit edf00b3
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/...ommon/src/main/java/org/apache/dubbo/common/threadpool/support/AbortPolicyWithReport.java b/...ommon/src/main/java/org/apache/dubbo/common/threadpool/support/AbortPolicyWithReport.java
@@ -156,13 +156,13 @@ private void dumpJStack() {
         if (!guard.tryAcquire()) {
             return;
         }
-        // To avoid multiple dump, check again
-        if (System.currentTimeMillis() - lastPrintTime < TEN_MINUTES_MILLS) {
-            return;
-        }
-
-        ExecutorService pool = Executors.newSingleThreadExecutor();
+        ExecutorService pool = null;
         try {
+            // To avoid multiple dump, check again
+            if (System.currentTimeMillis() - lastPrintTime < TEN_MINUTES_MILLS) {
+                return;
+            }
+            pool = Executors.newSingleThreadExecutor();
             pool.execute(() -> {
                 String dumpPath = getDumpPath();
 
@@ -186,12 +186,14 @@ private void dumpJStack() {
                     logger.error(COMMON_UNEXPECTED_CREATE_DUMP, "", "", "dump jStack error", t);
                 } finally {
                     lastPrintTime = System.currentTimeMillis();
-                    guard.release();
                 }
             });
         } finally {
+            guard.release();
             // must shutdown thread pool ,if not will lead to OOM
-            pool.shutdown();
+            if (pool != null) {
+                pool.shutdown();
+            }
         }
     }