SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not require eurekaConfig.

Browse Source 
Helps when eureka is on the classpath, but is explicitly disabled.

fixes gh-521
This commit is contained in:
Spencer Gibb
2015-10-12 11:16:08 -06:00
parent a96666b902
commit 3e0e47612c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientConfiguration.java
View File

@@ -69,7 +69,7 @@ public class EurekaRibbonClientConfiguration {
@Autowired(required = false)
private EurekaClientConfig clientConfig;
@Autowired
@Autowired(required = false)
private EurekaInstanceConfig eurekaConfig;
public EurekaRibbonClientConfiguration() {
@@ -112,7 +112,7 @@ public class EurekaRibbonClientConfiguration {
String zone = ConfigurationManager.getDeploymentContext().getValue(
ContextKey.zone);
if (this.clientConfig != null && StringUtils.isEmpty(zone)) {
if (approximateZoneFromHostname) {
if (approximateZoneFromHostname && eurekaConfig != null) {
String approxZone = ZoneUtils.extractApproximateZone(eurekaConfig
.getHostName(false));
log.debug("Setting Zone To " + approxZone);