From f0d8c86b512361eb87b446dbc7dcf6d828268085 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 24 Mar 2015 13:21:46 -0600
Subject: [PATCH] Only call shutdown() if DiscoveryClient is not null.

fixes spring-cloud-samples/tests/issues/2
---
 .../config/DiscoveryClientConfigServiceAutoConfiguration.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 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
index 41b694f2..362982bd 100644
--- 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);