Fix NPE when unexport Metadata Service (#6450)

apache · Jul 13, 2020 · a2e5102 · a2e5102
1 parent 58d5e51
commit a2e5102
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...nfig/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java b/...nfig/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
@@ -74,6 +74,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.concurrent.CompletableFuture;
@@ -1005,10 +1006,10 @@ private void exportMetadataService() {
     }
 
     private void unexportMetadataService() {
-        metadataServiceExporters
-                .stream()
-                .filter(this::supports)
-                .forEach(MetadataServiceExporter::unexport);
+        Optional.ofNullable(metadataServiceExporters)
+                .ifPresent(set -> set.stream()
+                        .filter(this::supports)
+                        .forEach(MetadataServiceExporter::unexport));
     }
 
     private boolean supports(MetadataServiceExporter exporter) {