SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoiding NPE in DiscoveryClientEndpointLocator

Browse Source
This commit is contained in:
Marcin Grzejszczak
2015-12-30 16:35:57 +01:00
parent 1991bb40c9
commit 334bc7fdf7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/DiscoveryClientEndpointLocator.java
View File

@@ -16,14 +16,12 @@
package org.springframework.cloud.sleuth.zipkin;
import java.net.InetAddress;
import com.twitter.zipkin.gen.Endpoint;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.util.InetUtils;
import com.twitter.zipkin.gen.Endpoint;
import java.net.InetAddress;
/**
* An {@link EndpointLocator} that tries to find local service information from a
@@ -43,6 +41,9 @@ public class DiscoveryClientEndpointLocator implements EndpointLocator {
@Override
public Endpoint local() {
ServiceInstance instance = this.client.getLocalServiceInstance();
if (instance == null) {
throw new NoServiceInstanceAvailableException();
}
return new Endpoint(getIpAddress(instance),
new Integer(instance.getPort()).shortValue(), instance.getServiceId());
}
@@ -57,4 +58,5 @@ public class DiscoveryClientEndpointLocator implements EndpointLocator {
}
}
static class NoServiceInstanceAvailableException extends RuntimeException { }
}