From 0795538f07261ed91400d12c51461a0cccfd9627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=B0=94=E7=9A=84=E6=B1=BD=E6=B0=B4?= <51789848+oreoft@users.noreply.github.com> Date: Thu, 18 Aug 2022 11:06:57 +0800 Subject: [PATCH] fix(hippo4j-server): The timeout period is configured to repair NPE (#542) --- .../config/service/biz/impl/ThreadPoolServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java index 5f3f84cc..9bb67cdf 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java @@ -40,7 +40,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; -import java.util.Optional; +import java.util.Objects; /** * Thread pool service impl. @@ -83,7 +83,7 @@ public class ThreadPoolServiceImpl implements ThreadPoolService { @Override public void saveOrUpdateThreadPoolConfig(String identify, ThreadPoolSaveOrUpdateReqDTO reqDTO) { ConfigAllInfo configAllInfo = BeanUtil.convert(reqDTO, ConfigAllInfo.class); - Long executeTimeOut = configAllInfo.getExecuteTimeOut() == 0 ? null : configAllInfo.getExecuteTimeOut(); + Long executeTimeOut = Objects.equals(configAllInfo.getExecuteTimeOut(), 0L) ? null : configAllInfo.getExecuteTimeOut(); configAllInfo.setExecuteTimeOut(executeTimeOut); configService.insertOrUpdate(identify, false, configAllInfo); } @@ -102,7 +102,7 @@ public class ThreadPoolServiceImpl implements ThreadPoolService { LogRecordInfo logRecordInfo = LogRecordInfo.builder() .bizKey(requestParam.getItemId() + "_" + requestParam.getTpId()) .bizNo(requestParam.getItemId() + "_" + requestParam.getTpId()) - .operator(Optional.ofNullable(UserContext.getUserName()).orElse("-")) + .operator(UserContext.getUserName()) .action("删除线程池: " + requestParam.getTpId()) .category("THREAD_POOL_DELETE") .detail(JSONUtil.toJSONString(requestParam))