Merge pull request #480 from Nigirimeshi/fix_datarace

fix data race in ActiveClientConn
smallnest · Jul 24, 2020 · 530623a · 530623a
2 parents fb13c76 + 005582c
commit 530623a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/server.go b/server/server.go
@@ -125,12 +125,12 @@ func (s *Server) Address() net.Addr {
 
 // ActiveClientConn returns active connections.
 func (s *Server) ActiveClientConn() []net.Conn {
-	result := make([]net.Conn, 0, len(s.activeConn))
 	s.mu.RLock()
+	defer s.mu.RUnlock()
+	result := make([]net.Conn, 0, len(s.activeConn))
 	for clientConn := range s.activeConn {
 		result = append(result, clientConn)
 	}
-	s.mu.RUnlock()
 	return result
 }