From ca845ad1190c666f4e213e7afd8823cc1c122796 Mon Sep 17 00:00:00 2001
From: Jason Wilder <jason@influxdb.com>
Date: Tue, 21 Apr 2015 14:58:16 -0600
Subject: [PATCH] Don't set client to nil when closing broker

Fixes 2352
---
 CHANGELOG.md | 1 +
 broker.go    | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f92fcccab..0d49e52835 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - [#2272](https://github.com/influxdb/influxdb/pull/2272): clustering: influxdb 0.9.0-rc23 panics when doing a GET with merge_metrics in a
 - [#2350](https://github.com/influxdb/influxdb/pull/2350): Issue fix for :influxd -hostname localhost.
 - [#2367](https://github.com/influxdb/influxdb/pull/2367): PR for issue #2350 - Always use localhost, not host name.
+- [#2371](https://github.com/influxdb/influxdb/pull/2371): Don't set client to nil when closing broker Fixes #2352
 
 ## v0.9.0-rc25 [2015-04-15]
 
diff --git a/broker.go b/broker.go
index 1f5296cccb..bef6d86275 100644
--- a/broker.go
+++ b/broker.go
@@ -73,12 +73,9 @@ func (b *Broker) Close() error {
 		b.done = nil
 	}
 
-	if b.client != nil {
-		// since the client doesn't specify a Transport when created,
-		// it will use the DefaultTransport.
-		http.DefaultTransport.(*http.Transport).CloseIdleConnections()
-		b.client = nil
-	}
+	// since the client doesn't specify a Transport when created,
+	// it will use the DefaultTransport.
+	http.DefaultTransport.(*http.Transport).CloseIdleConnections()
 
 	return b.Broker.Close()
 }