Make isSecure() match getPort() in secure vs non-secure resolution

2015-08-11 15:14:04 -06:00
parent 9e40714e3c
commit 539ca47bab
1 changed files with 2 additions and 1 deletions
--- 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