From cef25b07f7196871010608cc567198ba73da824e Mon Sep 17 00:00:00 2001
From: yanrongzhen <bruceyan@didiglobal.com>
Date: Thu, 16 Mar 2023 17:52:51 +0800
Subject: [PATCH] fix: Prevent NPE exceptions from being thrown when certain
 parameters are not configured.

---
 .../refresher/event/WebExecutorRefreshListener.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java
index e7c2a269..a7f9e60d 100644
--- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java
+++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java
@@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
 
 import java.util.Objects;
+import java.util.Optional;
 
 import static cn.hippo4j.config.springboot.starter.refresher.event.Hippo4jConfigDynamicRefreshEventOrder.WEB_EXECUTOR_LISTENER;
 
@@ -55,6 +56,17 @@ public class WebExecutorRefreshListener extends AbstractRefreshListener<WebThrea
                 WebThreadPoolHandlerChoose webThreadPoolHandlerChoose = ApplicationContextHolder.getBean(WebThreadPoolHandlerChoose.class);
                 WebThreadPoolService webThreadPoolService = webThreadPoolHandlerChoose.choose();
                 ThreadPoolParameter beforeParameter = webThreadPoolService.getWebThreadPoolParameter();
+
+                // Prevent NPE exceptions from being thrown when certain parameters are not configured.
+                if (nowParameter.getCoreSize() == null) {
+                    nowParameter.setCoreSize(beforeParameter.getCoreSize());
+                }
+                if (nowParameter.getMaxSize() == null) {
+                    nowParameter.setMaxSize(beforeParameter.getMaxSize());
+                }
+                if (nowParameter.getKeepAliveTime() == null) {
+                    nowParameter.setKeepAliveTime(beforeParameter.getKeepAliveTime());
+                }
                 if (!Objects.equals(beforeParameter.getCoreSize(), nowParameter.getCoreSize())
                         || !Objects.equals(beforeParameter.getMaxSize(), nowParameter.getMaxSize())
                         || !Objects.equals(beforeParameter.getKeepAliveTime(), nowParameter.getKeepAliveTime())) {