Merge pull request #762 from LK4D4/prevent_double_close

server: close only non-closed listeners
2016-07-14 10:55:03 -07:00 · 2016-07-14 10:55:03 -07:00 · 108308b1d3
parent 13edeeffde 47de9c3564
commit 108308b1d3
1 changed files with 4 additions and 2 deletions
--- a/server.go
+++ b/server.go
@ -320,9 +320,11 @@ func (s *Server) Serve(lis net.Listener) error {
 	s.lis[lis] = true
 	s.mu.Unlock()
 	defer func() {
-		lis.Close()
 		s.mu.Lock()
-		delete(s.lis, lis)
+		if s.lis != nil && s.lis[lis] {
+			lis.Close()
+			delete(s.lis, lis)
+		}
 		s.mu.Unlock()
 	}()
 	for {