Recover from send on closed channel

jcelliott · Jan 16, 2017 · 001aac8 · 001aac8
1 parent 4a4b738
commit 001aac8
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/session.go b/session.go
@@ -59,12 +59,19 @@ func (s *localPeer) Receive() <-chan Message {
 	return s.incoming
 }
 
-func (s *localPeer) Send(msg Message) error {
+func (s *localPeer) Send(msg Message) (err error) {
+	defer func() {
+		// just in case Close is called before Send
+		err = recover()
+	}()
 	s.outgoing <- msg
-	return nil
+	return
 }
 
 func (s *localPeer) Close() error {
-	close(s.outgoing)
+	if s.outgoing != nil {
+		close(s.outgoing)
+		s.outgoing = nil
+	}
 	return nil
 }