From a48084a2afa71846196db2d6c67a38dc9145b1ea Mon Sep 17 00:00:00 2001
From: Derek Collison <derek@apcera.com>
Date: Thu, 24 Jul 2014 16:01:50 -0700
Subject: [PATCH] Make sure to account for route connections

---
 server/server.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/server/server.go b/server/server.go
index b447a1c9..3639e18b 100644
--- a/server/server.go
+++ b/server/server.go
@@ -210,10 +210,15 @@ func (s *Server) Shutdown() {
 
 	s.running = false
 
+	conns := make(map[uint64]*client)
+
 	// Copy off the clients
-	clients := make(map[uint64]*client)
 	for i, c := range s.clients {
-		clients[i] = c
+		conns[i] = c
+	}
+	// Copy off the routes
+	for i, r := range s.routes {
+		conns[i] = r
 	}
 
 	// Number of done channel responses we expect.
@@ -245,8 +250,8 @@ func (s *Server) Shutdown() {
 
 	s.mu.Unlock()
 
-	// Close client connections
-	for _, c := range clients {
+	// Close client and route connections
+	for _, c := range conns {
 		c.closeConnection()
 	}