From 3f80cf3a1eda488adefab4e77240dfd665f47273 Mon Sep 17 00:00:00 2001
From: "chen.ma" <machencoding@163.com>
Date: Sat, 29 Oct 2022 14:06:46 +0800
Subject: [PATCH] After the dynamic thread pool is modified multiple times, the
 queue prompt information is lost (#868)

---
 .../event/DynamicThreadPoolRefreshListener.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java
index e570caa4..52a13cd7 100644
--- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java
+++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java
@@ -105,10 +105,18 @@ public class DynamicThreadPoolRefreshListener extends AbstractRefreshListener<Ex
         }
     }
 
+    /**
+     * Fail default executor properties.
+     *
+     * @param beforeProperties old properties
+     * @param properties       new properties
+     * @return executor properties
+     */
     private ExecutorProperties failDefaultExecutorProperties(ExecutorProperties beforeProperties, ExecutorProperties properties) {
         return ExecutorProperties.builder()
                 .corePoolSize(Optional.ofNullable(properties.getCorePoolSize()).orElse(beforeProperties.getCorePoolSize()))
                 .maximumPoolSize(Optional.ofNullable(properties.getMaximumPoolSize()).orElse(beforeProperties.getMaximumPoolSize()))
+                .blockingQueue(properties.getBlockingQueue())
                 .queueCapacity(Optional.ofNullable(properties.getQueueCapacity()).orElse(beforeProperties.getQueueCapacity()))
                 .keepAliveTime(Optional.ofNullable(properties.getKeepAliveTime()).orElse(beforeProperties.getKeepAliveTime()))
                 .executeTimeOut(Optional.ofNullable(properties.getExecuteTimeOut()).orElse(beforeProperties.getExecuteTimeOut()))
@@ -127,7 +135,6 @@ public class DynamicThreadPoolRefreshListener extends AbstractRefreshListener<Ex
      */
     private ChangeParameterNotifyRequest buildChangeRequest(ExecutorProperties beforeProperties, ExecutorProperties properties) {
         ChangeParameterNotifyRequest changeParameterNotifyRequest = ChangeParameterNotifyRequest.builder()
-                .blockingQueueName(beforeProperties.getBlockingQueue())
                 .beforeCorePoolSize(beforeProperties.getCorePoolSize())
                 .beforeMaximumPoolSize(beforeProperties.getMaximumPoolSize())
                 .beforeAllowsCoreThreadTimeOut(beforeProperties.getAllowCoreThreadTimeOut())
@@ -135,6 +142,7 @@ public class DynamicThreadPoolRefreshListener extends AbstractRefreshListener<Ex
                 .beforeQueueCapacity(beforeProperties.getQueueCapacity())
                 .beforeRejectedName(beforeProperties.getRejectedHandler())
                 .beforeExecuteTimeOut(beforeProperties.getExecuteTimeOut())
+                .blockingQueueName(properties.getBlockingQueue())
                 .nowCorePoolSize(Optional.ofNullable(properties.getCorePoolSize()).orElse(beforeProperties.getCorePoolSize()))
                 .nowMaximumPoolSize(Optional.ofNullable(properties.getMaximumPoolSize()).orElse(beforeProperties.getMaximumPoolSize()))
                 .nowAllowsCoreThreadTimeOut(Optional.ofNullable(properties.getAllowCoreThreadTimeOut()).orElse(beforeProperties.getAllowCoreThreadTimeOut()))