From d4bb9e3772839092bf2f513bac487f95c51b593f Mon Sep 17 00:00:00 2001 From: xinhao <1344650328@qq.com> Date: Mon, 3 Jul 2023 14:54:52 +0800 Subject: [PATCH 1/2] #1251 Resolved two registration issues (#1383) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 章新好 Sunny Zhang --- .../src/main/java/cn/hippo4j/discovery/core/Lease.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/core/Lease.java b/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/core/Lease.java index 0d796f9e..f1b37ceb 100644 --- a/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/core/Lease.java +++ b/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/core/Lease.java @@ -47,8 +47,8 @@ public class Lease { public Lease(T r) { holder = r; registrationTimestamp = System.currentTimeMillis(); - lastUpdateTimestamp = registrationTimestamp; duration = DEFAULT_DURATION_IN_SECS; + lastUpdateTimestamp = registrationTimestamp + duration; } public void renew() { From 10bc5c300fce1d86e4cb3865da37a0e630843d5c Mon Sep 17 00:00:00 2001 From: LauItachi <22516902+MagikLau@users.noreply.github.com> Date: Thu, 6 Jul 2023 16:13:58 +0800 Subject: [PATCH 2/2] Update AdaptedThreadPoolDestroyPostProcessor.java add default impl (#1384) Fix match case: spring-beans-4.3.21.RELEASE.jar Forked from: spring-beans-5.1.14.RELEASE.jar --- .../AdaptedThreadPoolDestroyPostProcessor.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/AdaptedThreadPoolDestroyPostProcessor.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/AdaptedThreadPoolDestroyPostProcessor.java index 0490b32b..ce425560 100644 --- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/AdaptedThreadPoolDestroyPostProcessor.java +++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/AdaptedThreadPoolDestroyPostProcessor.java @@ -78,6 +78,20 @@ public class AdaptedThreadPoolDestroyPostProcessor implements DestructionAwareBe .ifPresent(executorHolder -> destroyAdaptedThreadPoolExecutor(beanName, executorHolder)); } + @Override + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { + // forked default implementation from spring-beans-5.1.14.RELEASE.jar + // org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization + return bean; + } + + @Override + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { + // forked default implementation from spring-beans-5.1.14.RELEASE.jar + // org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization + return bean; + } + private void destroyAdaptedThreadPoolExecutor(String beanName, ThreadPoolExecutorHolder executorHolder) { try { if (log.isDebugEnabled()) {