fix lock

CHANGELOG.md

@@ -6,6 +6,8 @@
 # 5.4.2 (2020-08-29)
 
 ### 新特性
+* 【core  】     lock放在try外边（pr#1050@Github）
+
 ### Bug修复#
 
 -------------------------------------------------------------------------------------------------------------

hutool-core/src/main/java/cn/hutool/core/thread/DelegatedExecutorService.java

@@ -1,5 +1,7 @@
 package cn.hutool.core.thread;
 
+import cn.hutool.core.lang.Assert;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.AbstractExecutorService;
@@ -18,12 +20,17 @@ import java.util.concurrent.TimeoutException;
 public class DelegatedExecutorService extends AbstractExecutorService {
 	private final ExecutorService e;
 
+	/**
+	 * 构造
+	 *
+	 * @param executor {@link ExecutorService}
+	 */
 	DelegatedExecutorService(ExecutorService executor) {
+		Assert.notNull(executor, "executor must be not null !");
 		e = executor;
 	}
 
 	@Override
-    @SuppressWarnings("NullableProblems")
 	public void execute(Runnable command) {
 		e.execute(command);
 	}
@@ -34,7 +41,6 @@ public class DelegatedExecutorService extends AbstractExecutorService {
 	}
 
 	@Override
-    @SuppressWarnings("NullableProblems")
 	public List<Runnable> shutdownNow() {
 		return e.shutdownNow();
 	}
@@ -50,44 +56,37 @@ public class DelegatedExecutorService extends AbstractExecutorService {
 	}
 
 	@Override
-    @SuppressWarnings("NullableProblems")
 	public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
 		return e.awaitTermination(timeout, unit);
 	}
 
 	@Override
-    @SuppressWarnings("NullableProblems")
 	public Future<?> submit(Runnable task) {
 		return e.submit(task);
 	}
 
 	@Override
-    @SuppressWarnings("NullableProblems")
 	public <T> Future<T> submit(Callable<T> task) {
 		return e.submit(task);
 	}
 
 	@Override
-    @SuppressWarnings("NullableProblems")
 	public <T> Future<T> submit(Runnable task, T result) {
 		return e.submit(task, result);
 	}
 
 	@Override
-    @SuppressWarnings("NullableProblems")
 	public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
 		return e.invokeAll(tasks);
 	}
 
 	@Override
-    @SuppressWarnings("NullableProblems")
 	public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
 			throws InterruptedException {
 		return e.invokeAll(tasks, timeout, unit);
 	}
 
 	@Override
-    @SuppressWarnings("NullableProblems")
 	public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
 			throws InterruptedException, ExecutionException {
 		return e.invokeAny(tasks);

hutool-core/src/main/java/cn/hutool/core/thread/FinalizableDelegatedExecutorService.java

@@ -8,6 +8,12 @@ import java.util.concurrent.ExecutorService;
  * @author loolly
  */
 public class FinalizableDelegatedExecutorService extends DelegatedExecutorService {
+
+	/**
+	 * 构造
+	 *
+	 * @param executor {@link ExecutorService}
+	 */
 	FinalizableDelegatedExecutorService(ExecutorService executor) {
 		super(executor);
 	}