From 43fab80d9198b884b82290b4961f095f45f55fdf Mon Sep 17 00:00:00 2001
From: kyle <573984425@qq.com>
Date: Thu, 16 Feb 2023 17:19:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20isDone=E5=88=A4=E6=96=AD=E4=B8=8D?=
 =?UTF-8?q?=E5=87=86=E7=A1=AE=EF=BC=8C=E6=9C=89=E5=8F=AF=E8=83=BD=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=E6=98=AF=E6=AD=A3=E5=B8=B8=E9=80=80=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

通过延迟5秒，再次检测任务状态，如果5秒都没有反应，假定线程已经全部结束
---
 .../com/jd/platform/async/executor/Async.java     | 15 ++++++++++++---
 .../src/test/java/v15/cases/Case15.java           |  6 +++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/asyncTool-core/src/main/java/com/jd/platform/async/executor/Async.java b/asyncTool-core/src/main/java/com/jd/platform/async/executor/Async.java
index 7c66de9..1ed954c 100644
--- a/asyncTool-core/src/main/java/com/jd/platform/async/executor/Async.java
+++ b/asyncTool-core/src/main/java/com/jd/platform/async/executor/Async.java
@@ -136,9 +136,18 @@ public class Async {
                 //任务结束就退出检查
                 if (onceWork.isFinish()) {
                     break;
-                } else if (onceWork.getAllThreadSubmit().stream().allMatch(future -> future.isDone() || future.isCancelled())) {
-                    //完成或者取消就及时取消任务
-                    if (!onceWork.isCancelled() && !onceWork.isWaitingCancel()) {
+                } else if (onceWork.getAllThreadSubmit().stream().allMatch(future -> future.isCancelled() || future.isDone())) {
+                    //等5秒再去操作
+                    long startTime = SystemClock.now();
+                    long now = SystemClock.now();
+                    while (TimeUnit.SECONDS.toMillis(5) > now - startTime) {
+                        now = SystemClock.now();
+                    }
+                    //未超时、未完成或者未取消就取消任务
+                    if (!(onceWork.hasTimeout()
+                            && onceWork.isFinish()
+                            && onceWork.isCancelled()
+                            && onceWork.isWaitingCancel())) {
                         onceWork.pleaseCancel();
                     }
                     break;
diff --git a/asyncTool-core/src/test/java/v15/cases/Case15.java b/asyncTool-core/src/test/java/v15/cases/Case15.java
index be1d997..09b99d6 100644
--- a/asyncTool-core/src/test/java/v15/cases/Case15.java
+++ b/asyncTool-core/src/test/java/v15/cases/Case15.java
@@ -69,7 +69,7 @@ class Case15 {
                 )
                 .build();
         try {
-            OnceWork work = Async.work(5000, a, d);
+            OnceWork work = Async.work(10000, a, d);
             ThreadPoolExecutor pool = new ThreadPoolExecutor(1, 1, 60, TimeUnit.SECONDS, new ArrayBlockingQueue<>(1));
 
             pool.execute(() -> {
@@ -95,8 +95,12 @@ class Case15 {
         }
 
         System.out.println("cost:" + (SystemClock.now() - now));
+        int count=1;
         while (build.getWorkResult().getEx() == null) {
             //同步等待result数据写入
+            if(count++>800){
+                break;
+            }
         }
         System.out.println("输出H节点的结果----" + build.getWorkResult());
         /* 输出:
-- 
Gitee