From a606961a22028a2c97309c964b95d1f28825ebc9 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Mon, 25 Jul 2016 21:46:08 -0400 Subject: [PATCH] Be safe when closing in destroy in case client is nil --- etcd.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etcd.go b/etcd.go index 2bebf691..94d94306 100644 --- a/etcd.go +++ b/etcd.go @@ -399,7 +399,9 @@ func (obj *EmbdEtcd) Destroy() error { obj.exitchan <- struct{}{} // cause main loop to exit obj.rLock.Lock() - obj.client.Close() + if obj.client != nil { + obj.client.Close() + } obj.client = nil obj.rLock.Unlock()