github-forks
/
spring-cloud-alibaba
mirror of https://github.com/alibaba/spring-cloud-alibaba.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1536 from guerlab/master

Browse Source 
[issue #1535 ]fix NacosServiceDiscovery.hostToServiceInstance  method potential NullPointerException
pull/1488/head
Mercy Ma 5 years ago committed by GitHub
parent 7b42a9a31e 7667a05aef
commit 93cb226850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java
Unescape Escape View File

@ -92,7 +92,9 @@ public class NacosServiceDiscovery {
metadata.put("nacos.weight", instance.getWeight() + ""); metadata.put("nacos.weight", instance.getWeight() + "");
metadata.put("nacos.healthy", instance.isHealthy() + ""); metadata.put("nacos.healthy", instance.isHealthy() + "");
metadata.put("nacos.cluster", instance.getClusterName() + ""); metadata.put("nacos.cluster", instance.getClusterName() + "");
metadata.putAll(instance.getMetadata()); if (instance.getMetadata() != null) {
metadata.putAll(instance.getMetadata());
}
nacosServiceInstance.setMetadata(metadata); nacosServiceInstance.setMetadata(metadata);
if (metadata.containsKey("secure")) { if (metadata.containsKey("secure")) {

Write Preview
Loading…
Cancel
Save