From 64e918538670994c3cc2cd82823c0bb6b1faa131 Mon Sep 17 00:00:00 2001
From: ben-toogood <bentoogood@gmail.com>
Date: Wed, 1 Jul 2020 12:03:13 +0100
Subject: [PATCH] router/registry: fix nil eventChan bug (#1773)

* router/registry: fix nil eventChan bug
---
 router/default.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/router/default.go b/router/default.go
index 552f06da..9cf3d96d 100644
--- a/router/default.go
+++ b/router/default.go
@@ -285,7 +285,6 @@ func (r *router) watchTable(w Watcher) error {
 
 		select {
 		case <-r.exit:
-			close(r.eventChan)
 			return nil
 		case r.eventChan <- event:
 			// process event
@@ -705,10 +704,13 @@ func (r *router) Close() error {
 		r.sub.Unlock()
 	}
 
-	// remove event chan
-	r.eventChan = nil
-	r.running = false
+	// close and remove event chan
+	if r.eventChan != nil {
+		close(r.eventChan)
+		r.eventChan = nil
+	}
 
+	r.running = false
 	return nil
 }