From 9c144220b1e2d2bcec4607d9112d2b43b8d96aed Mon Sep 17 00:00:00 2001 From: boostrack Date: Mon, 28 Sep 2015 09:19:30 +0200 Subject: [PATCH] DRY --- .../cloud/netflix/eureka/EurekaDiscoveryClient.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 60b2985e..9e5f2d1f 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 @@ -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