Fix NPE when removing registry (#11514)

Co-authored-by: zhujy <zhujy@pingpongx.com>
apache · Feb 10, 2023 · 1ab11d3 · 1ab11d3
1 parent bc55100
commit 1ab11d3
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/...bo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/...bo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -909,23 +909,25 @@ public void unexport() {
                 if (subscribeUrl != null) {
                     Map<URL, Set<NotifyListener>> overrideListeners = getProviderConfigurationListener(subscribeUrl).getOverrideListeners();
                     Set<NotifyListener> listeners = overrideListeners.get(subscribeUrl);
-                    if (listeners.remove(notifyListener)) {
-                        if (!registry.isServiceDiscovery()) {
-                            registry.unsubscribe(subscribeUrl, notifyListener);
-                        }
-                        ApplicationModel applicationModel = getApplicationModel(registerUrl.getScopeModel());
-                        if (applicationModel.getModelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_CONFIGURATION_LISTEN, true)) {
-                            for (ModuleModel moduleModel : applicationModel.getPubModuleModels()) {
-                                if (moduleModel.getServiceRepository().getExportedServices().size() > 0) {
-                                    moduleModel.getExtensionLoader(GovernanceRuleRepository.class).getDefaultExtension()
-                                        .removeListener(subscribeUrl.getServiceKey() + CONFIGURATORS_SUFFIX,
-                                            serviceConfigurationListeners.remove(subscribeUrl.getServiceKey()));
+                    if(listeners != null){
+                        if (listeners.remove(notifyListener)) {
+                            if (!registry.isServiceDiscovery()) {
+                                registry.unsubscribe(subscribeUrl, notifyListener);
+                            }
+                            ApplicationModel applicationModel = getApplicationModel(registerUrl.getScopeModel());
+                            if (applicationModel.getModelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_CONFIGURATION_LISTEN, true)) {
+                                for (ModuleModel moduleModel : applicationModel.getPubModuleModels()) {
+                                    if (moduleModel.getServiceRepository().getExportedServices().size() > 0) {
+                                        moduleModel.getExtensionLoader(GovernanceRuleRepository.class).getDefaultExtension()
+                                            .removeListener(subscribeUrl.getServiceKey() + CONFIGURATORS_SUFFIX,
+                                                serviceConfigurationListeners.remove(subscribeUrl.getServiceKey()));
+                                    }
                                 }
                             }
                         }
-                    }
-                    if (listeners.isEmpty()) {
-                        overrideListeners.remove(subscribeUrl);
+                        if (listeners.isEmpty()) {
+                            overrideListeners.remove(subscribeUrl);
+                        }
                     }
                 }
             } catch (Throwable t) {