Only call shutdown() if DiscoveryClient is not null.

fixes spring-cloud-samples/tests/issues/2

Only call shutdown() if DiscoveryClient is not null.
f0d8c86b · Spencer Gibb · 76d0c018 · f0d8c86b
Commit f0d8c86b authored Mar 24, 2015 by Spencer Gibb
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

DiscoveryClientConfigServiceAutoConfiguration.java ...config/DiscoveryClientConfigServiceAutoConfiguration.java +3 -1

No files found.
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfiguration.java
@@ -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);