commit 84f837b76d4925bf5e86dd6ddaf0ede90db3b4c5
author Albumen Kevin <jhq0812@gmail.com> Wed Sep 14 11:47:30 2022 +0800
committer GitHub <noreply@github.com> Wed Sep 14 11:47:30 2022 +0800
tree a03f65fd4a219874fc32582e3481e3af511785f2
parent 631d3fc26fc031848d2bffb28eff65862dbfe9bf

Fix Nacos unSubscribe when shutdown (#10609)

dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java

diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
index e96fce2..076e637 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
@@ -277,6 +277,9 @@
             shutdownServiceNamesLookup();
         } else {
             Map<NotifyListener, NacosAggregateListener> listenerMap = originToAggregateListener.get(url);
+            if (listenerMap == null) {
+                return;
+            }
             NacosAggregateListener nacosAggregateListener = listenerMap.remove(listener);
             if (nacosAggregateListener != null) {
                 Set<String> serviceNames = getServiceNames(url, nacosAggregateListener);

dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java

diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java
index 1fa01d4..6435111 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java
@@ -78,6 +78,7 @@
     @Override
     public void doDestroy() throws Exception {
         this.namingService.shutdown();
+        this.eventListeners.clear();
     }
 
     @Override