From e8c38365032b1cf97ef0179e4c6b328b2e98beb6 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 20 May 2015 16:12:14 -0600 Subject: [PATCH] fix NPE --- .../cloud/consul/discovery/ConsulLifecycle.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java index fd179378..eb5a94e3 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java @@ -104,7 +104,9 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle { } private void deregister(String serviceId) { - ttlScheduler.remove(serviceId); + if (ttlScheduler != null) { + ttlScheduler.remove(serviceId); + } client.agentServiceDeregister(serviceId); }