Merge pull request #485 from jghiloni/master

* pull485: Make `isSecure()` match `getPort()` in secure vs non-secure resolution

Merge pull request #485 from jghiloni/master
ddb09c49 · Spencer Gibb · 9e40714e · 539ca47b · ddb09c49
Commit ddb09c49 authored Aug 11, 2015 by Spencer Gibb
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

EurekaDiscoveryClient.java ...framework/cloud/netflix/eureka/EurekaDiscoveryClient.java +2 -1

No files found.
--- 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