From 3af1b5c51c48e3ec8425eb65aafa745e810e04c2 Mon Sep 17 00:00:00 2001 From: guerlab Date: Thu, 18 Jun 2020 23:16:27 +0800 Subject: [PATCH 1/2] fix potential NullPointerException --- .../alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java index ffe73aaf..0ae920f8 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java @@ -17,6 +17,7 @@ package com.alibaba.cloud.nacos.discovery; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -92,7 +93,7 @@ public class NacosServiceDiscovery { metadata.put("nacos.weight", instance.getWeight() + ""); metadata.put("nacos.healthy", instance.isHealthy() + ""); metadata.put("nacos.cluster", instance.getClusterName() + ""); - metadata.putAll(instance.getMetadata()); + metadata.putAll(instance.getMetadata() != null ? instance.getMetadata() : Collections.emptyMap()); nacosServiceInstance.setMetadata(metadata); if (metadata.containsKey("secure")) { From 7667a05aefff18fb14b6c957bf340538e53b1134 Mon Sep 17 00:00:00 2001 From: guerlab Date: Fri, 19 Jun 2020 11:25:57 +0800 Subject: [PATCH 2/2] fix NacosServiceDiscovery NullPointerException --- .../alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java index 0ae920f8..848abde9 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java @@ -17,7 +17,6 @@ package com.alibaba.cloud.nacos.discovery; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -93,7 +92,9 @@ public class NacosServiceDiscovery { metadata.put("nacos.weight", instance.getWeight() + ""); metadata.put("nacos.healthy", instance.isHealthy() + ""); metadata.put("nacos.cluster", instance.getClusterName() + ""); - metadata.putAll(instance.getMetadata() != null ? instance.getMetadata() : Collections.emptyMap()); + if (instance.getMetadata() != null) { + metadata.putAll(instance.getMetadata()); + } nacosServiceInstance.setMetadata(metadata); if (metadata.containsKey("secure")) {