From 0c35595b44c49ee3df728fc963c75f6cc8d8283f Mon Sep 17 00:00:00 2001 From: onewe Date: Fri, 1 Jan 2021 19:36:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(NacosConfigManager):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dweblogic=E4=B8=ADclassloader=E6=B3=84=E6=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - NacosConfigManager增加销毁方法,关闭nacos相关线程池 --- .../com/alibaba/cloud/nacos/NacosConfigManager.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java index e27b3e06..7f8eb9d8 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java @@ -18,6 +18,8 @@ package com.alibaba.cloud.nacos; import java.util.Objects; +import javax.annotation.PreDestroy; + import com.alibaba.cloud.nacos.diagnostics.analyzer.NacosConnectionFailureException; import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.config.ConfigService; @@ -73,6 +75,14 @@ public class NacosConfigManager { return service; } + @PreDestroy + public void destroy() throws NacosException { + if(service != null){ + service.shutDown(); + service = null; + } + } + public NacosConfigProperties getNacosConfigProperties() { return nacosConfigProperties; } From 17b3b7f858eafddf949c81c42f56992b0e60ba3c Mon Sep 17 00:00:00 2001 From: onewe Date: Mon, 4 Jan 2021 14:11:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(NacosConfigManager):=20=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/alibaba/cloud/nacos/NacosConfigManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java index 7f8eb9d8..e8199832 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java @@ -77,7 +77,7 @@ public class NacosConfigManager { @PreDestroy public void destroy() throws NacosException { - if(service != null){ + if (service != null) { service.shutDown(); service = null; }