Merge pull request #557 from boostrack-cloud/boostrack-patch-1

DRY

Merge pull request #557 from boostrack-cloud/boostrack-patch-1
0141a13c · Spencer Gibb · aa862673 · 9c144220 · 0141a13c
Commit 0141a13c authored Sep 28, 2015 by Spencer Gibb
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

EurekaDiscoveryClient.java ...framework/cloud/netflix/eureka/EurekaDiscoveryClient.java +3 -4

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
@@ -112,11 +112,10 @@ public class EurekaDiscoveryClient implements DiscoveryClient {

 		@Override
 		public int getPort() {
-			// assume if secure is enabled, that is the default
-			if (!this.instance.isPortEnabled(SECURE)) {
-				return this.instance.getPort();
+			if (isSecure()) {
+				return this.instance.getSecurePort();
 			}
-			return this.instance.getSecurePort();
+			return this.instance.getPort();
 		}

 		@Override