mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-05-09 23:51:34 +08:00
fix code
This commit is contained in:
parent
9040c205b8
commit
596529f2d5
@ -13,6 +13,7 @@
|
|||||||
package org.dromara.hutool.core.thread;
|
package org.dromara.hutool.core.thread;
|
||||||
|
|
||||||
import org.dromara.hutool.core.exception.HutoolException;
|
import org.dromara.hutool.core.exception.HutoolException;
|
||||||
|
import org.dromara.hutool.core.lang.Console;
|
||||||
|
|
||||||
import java.io.Closeable;
|
import java.io.Closeable;
|
||||||
import java.util.LinkedHashSet;
|
import java.util.LinkedHashSet;
|
||||||
@ -53,6 +54,11 @@ public class SyncFinisher implements Closeable {
|
|||||||
*/
|
*/
|
||||||
private CountDownLatch endLatch;
|
private CountDownLatch endLatch;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 异常处理
|
||||||
|
*/
|
||||||
|
private Thread.UncaughtExceptionHandler exceptionHandler;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 构造
|
* 构造
|
||||||
*
|
*
|
||||||
@ -75,6 +81,17 @@ public class SyncFinisher implements Closeable {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设置异常处理
|
||||||
|
*
|
||||||
|
* @param exceptionHandler 异常处理器
|
||||||
|
* @return this
|
||||||
|
*/
|
||||||
|
public SyncFinisher setExceptionHandler(final Thread.UncaughtExceptionHandler exceptionHandler) {
|
||||||
|
this.exceptionHandler = exceptionHandler;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加定义的线程数同等数量的worker
|
* 增加定义的线程数同等数量的worker
|
||||||
*
|
*
|
||||||
@ -139,10 +156,11 @@ public class SyncFinisher implements Closeable {
|
|||||||
endLatch = new CountDownLatch(workers.size());
|
endLatch = new CountDownLatch(workers.size());
|
||||||
|
|
||||||
if (null == this.executorService || this.executorService.isShutdown()) {
|
if (null == this.executorService || this.executorService.isShutdown()) {
|
||||||
this.executorService = ThreadUtil.newExecutor(threadSize);
|
this.executorService = buildExecutor();
|
||||||
}
|
}
|
||||||
for (final Worker worker : workers) {
|
for (final Worker worker : workers) {
|
||||||
executorService.submit(worker);
|
//executorService.submit(worker);
|
||||||
|
executorService.execute(worker);
|
||||||
}
|
}
|
||||||
// 保证所有worker同时开始
|
// 保证所有worker同时开始
|
||||||
this.beginLatch.countDown();
|
this.beginLatch.countDown();
|
||||||
@ -241,4 +259,16 @@ public class SyncFinisher implements Closeable {
|
|||||||
*/
|
*/
|
||||||
public abstract void work();
|
public abstract void work();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 构建线程池,加入了自定义的异常处理
|
||||||
|
*
|
||||||
|
* @return {@link ExecutorService}
|
||||||
|
*/
|
||||||
|
private ExecutorService buildExecutor() {
|
||||||
|
return ExecutorBuilder.of()
|
||||||
|
.setCorePoolSize(threadSize)
|
||||||
|
.setThreadFactory(new NamedThreadFactory("hutool-", null, false, exceptionHandler))
|
||||||
|
.build();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2023 looly(loolly@aliyun.com)
|
||||||
|
* Hutool is licensed under Mulan PSL v2.
|
||||||
|
* You can use this software according to the terms and conditions of the Mulan PSL v2.
|
||||||
|
* You may obtain a copy of Mulan PSL v2 at:
|
||||||
|
* http://license.coscl.org.cn/MulanPSL2
|
||||||
|
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
|
||||||
|
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
|
||||||
|
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
|
||||||
|
* See the Mulan PSL v2 for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.dromara.hutool.core.thread;
|
||||||
|
|
||||||
|
import org.dromara.hutool.core.lang.Console;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
public class SyncFinisherTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* https://gitee.com/dromara/hutool/issues/I716SX
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
void executeExceptionTest() {
|
||||||
|
final SyncFinisher syncFinisher = new SyncFinisher(10);
|
||||||
|
syncFinisher.addWorker(()->{
|
||||||
|
Console.log(Integer.parseInt("XYZ"));//这里会抛RuntimeException
|
||||||
|
});
|
||||||
|
|
||||||
|
syncFinisher.setExceptionHandler((t, e) -> {
|
||||||
|
Assertions.assertEquals("For input string: \"XYZ\"", e.getMessage());
|
||||||
|
});
|
||||||
|
|
||||||
|
syncFinisher.start();
|
||||||
|
syncFinisher.close();
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user