msb-public
/
hippo4j
mirror of https://github.com/longtai-cn/hippo4j
1
0
Code Issues Projects Releases Wiki Activity

fix(hippo4j-server): The timeout period is configured to repair NPE (#542)

Browse Source
pull/546/head^2
没有气的汽水 3 years ago committed by GitHub
parent 7f60c6965f
commit 0795538f07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java
Unescape View File

@ -40,7 +40,7 @@ import org.springframework.stereotype.Service;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Objects;
/** /**
* Thread pool service impl. * Thread pool service impl.
@ -83,7 +83,7 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
@Override @Override
public void saveOrUpdateThreadPoolConfig(String identify, ThreadPoolSaveOrUpdateReqDTO reqDTO) { public void saveOrUpdateThreadPoolConfig(String identify, ThreadPoolSaveOrUpdateReqDTO reqDTO) {
ConfigAllInfo configAllInfo = BeanUtil.convert(reqDTO, ConfigAllInfo.class); 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); configAllInfo.setExecuteTimeOut(executeTimeOut);
configService.insertOrUpdate(identify, false, configAllInfo); configService.insertOrUpdate(identify, false, configAllInfo);
} }
@ -102,7 +102,7 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
LogRecordInfo logRecordInfo = LogRecordInfo.builder() LogRecordInfo logRecordInfo = LogRecordInfo.builder()
.bizKey(requestParam.getItemId() + "_" + requestParam.getTpId()) .bizKey(requestParam.getItemId() + "_" + requestParam.getTpId())
.bizNo(requestParam.getItemId() + "_" + requestParam.getTpId()) .bizNo(requestParam.getItemId() + "_" + requestParam.getTpId())
.operator(Optional.ofNullable(UserContext.getUserName()).orElse("-")) .operator(UserContext.getUserName())
.action("删除线程池: " + requestParam.getTpId()) .action("删除线程池: " + requestParam.getTpId())
.category("THREAD_POOL_DELETE") .category("THREAD_POOL_DELETE")
.detail(JSONUtil.toJSONString(requestParam)) .detail(JSONUtil.toJSONString(requestParam))

Write Preview
Loading…
Cancel
Save