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

Only prepend hostname if it has text

Browse Source
This commit is contained in:
Spencer Gibb
2016-05-23 12:16:54 -06:00
parent 69fd8e7eed
commit 2ff2ce4de4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/CloudJacksonJson.java
View File

@@ -7,6 +7,7 @@ import java.lang.reflect.Field;
import java.util.HashMap; import java.util.HashMap;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
@@ -133,7 +134,7 @@ public class CloudJacksonJson extends LegacyJacksonJson {
private String calculateInstanceId(InstanceInfo info) { private String calculateInstanceId(InstanceInfo info) {
String instanceId = info.getMetadata().get("instanceId"); String instanceId = info.getMetadata().get("instanceId");
String hostName = info.getHostName(); String hostName = info.getHostName();
if (instanceId != null && !instanceId.startsWith(hostName)) { if (instanceId != null && StringUtils.hasText(hostName) && !instanceId.startsWith(hostName)) {
instanceId = hostName + ":" + instanceId; instanceId = hostName + ":" + instanceId;
} }
return instanceId == null ? hostName : instanceId; return instanceId == null ? hostName : instanceId;