From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java | 70 +++++++++++------------------------
1 files changed, 22 insertions(+), 48 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
index 1934195..5be9582 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
@@ -1,33 +1,25 @@
package com.ruoyi.common.utils;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.concurrent.*;
+
/**
* 绾跨▼鐩稿叧宸ュ叿绫�.
- *
+ *
* @author ruoyi
*/
-public class Threads
-{
+public class Threads {
private static final Logger logger = LoggerFactory.getLogger(Threads.class);
/**
* sleep绛夊緟,鍗曚綅涓烘绉�
*/
- public static void sleep(long milliseconds)
- {
- try
- {
+ public static void sleep(long milliseconds) {
+ try {
Thread.sleep(milliseconds);
- }
- catch (InterruptedException e)
- {
+ } catch (InterruptedException e) {
return;
}
}
@@ -36,27 +28,20 @@
* 鍋滄绾跨▼姹�
* 鍏堜娇鐢╯hutdown, 鍋滄鎺ユ敹鏂颁换鍔″苟灏濊瘯瀹屾垚鎵�鏈夊凡瀛樺湪浠诲姟.
* 濡傛灉瓒呮椂, 鍒欒皟鐢╯hutdownNow, 鍙栨秷鍦╳orkQueue涓璓ending鐨勪换鍔�,骞朵腑鏂墍鏈夐樆濉炲嚱鏁�.
- * 濡傛灉浠嶄汉瓒呮檪锛屽墖寮峰埗閫�鍑�.
+ * 濡傛灉浠嶇劧瓒呮檪锛屽墖寮峰埗閫�鍑�.
* 鍙﹀鍦╯hutdown鏃剁嚎绋嬫湰韬璋冪敤涓柇鍋氫簡澶勭悊.
*/
- public static void shutdownAndAwaitTermination(ExecutorService pool)
- {
- if (pool != null && !pool.isShutdown())
- {
+ public static void shutdownAndAwaitTermination(ExecutorService pool) {
+ if (pool != null && !pool.isShutdown()) {
pool.shutdown();
- try
- {
- if (!pool.awaitTermination(120, TimeUnit.SECONDS))
- {
+ try {
+ if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
pool.shutdownNow();
- if (!pool.awaitTermination(120, TimeUnit.SECONDS))
- {
+ if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
logger.info("Pool did not terminate");
}
}
- }
- catch (InterruptedException ie)
- {
+ } catch (InterruptedException ie) {
pool.shutdownNow();
Thread.currentThread().interrupt();
}
@@ -66,33 +51,22 @@
/**
* 鎵撳嵃绾跨▼寮傚父淇℃伅
*/
- public static void printException(Runnable r, Throwable t)
- {
- if (t == null && r instanceof Future<?>)
- {
- try
- {
+ public static void printException(Runnable r, Throwable t) {
+ if (t == null && r instanceof Future<?>) {
+ try {
Future<?> future = (Future<?>) r;
- if (future.isDone())
- {
+ if (future.isDone()) {
future.get();
}
- }
- catch (CancellationException ce)
- {
+ } catch (CancellationException ce) {
t = ce;
- }
- catch (ExecutionException ee)
- {
+ } catch (ExecutionException ee) {
t = ee.getCause();
- }
- catch (InterruptedException ie)
- {
+ } catch (InterruptedException ie) {
Thread.currentThread().interrupt();
}
}
- if (t != null)
- {
+ if (t != null) {
logger.error(t.getMessage(), t);
}
}
--
Gitblit v1.9.3