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

Only call shutdown() if DiscoveryClient is not null.

Browse Source 
fixes spring-cloud-samples/tests/issues/2
This commit is contained in:
Spencer Gibb
2015-03-24 13:21:46 -06:00
parent 76d0c018ee
commit f0d8c86b51
1 changed files with 3 additions and 1 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/config/DiscoveryClientConfigServiceAutoConfiguration.java
View File

@@ -58,7 +58,9 @@ public class DiscoveryClientConfigServiceAutoConfiguration {
this.lifecycle.stop();
rebind(this.clientConfig, "eurekaClientConfig");
rebind(this.instanceConfig, "eurekaInstanceConfig");
DiscoveryManager.getInstance().getDiscoveryClient().shutdown();
if (DiscoveryManager.getInstance().getDiscoveryClient() != null) {
DiscoveryManager.getInstance().getDiscoveryClient().shutdown();
}
ApplicationInfoManager.getInstance().initComponent(this.instanceConfig);
DiscoveryManager.getInstance().initComponent(this.instanceConfig,
this.clientConfig);