From 539ca47babf8d8b66aa71c3eaf5a2de80e6b6b88 Mon Sep 17 00:00:00 2001 From: Josh Ghiloni Date: Tue, 11 Aug 2015 15:14:04 -0600 Subject: [PATCH] Make `isSecure()` match `getPort()` in secure vs non-secure resolution --- .../cloud/netflix/eureka/EurekaDiscoveryClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java index 623e27bf..9c5c450a 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java @@ -121,7 +121,8 @@ public class EurekaDiscoveryClient implements DiscoveryClient { @Override public boolean isSecure() { - return this.instance.isPortEnabled(SECURE); + // assume if unsecure is enabled, that is the default + return !this.instance.isPortEnabled(UNSECURE) && this.instance.isPortEnabled(SECURE); } @Override