Don't release resources until all current requests are complete.

sdg0919 · Nov 13, 2017 · b18626e · b18626e
1 parent c8738ca
commit b18626e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/rpc/server.go b/rpc/server.go
@@ -283,15 +283,18 @@ func (conn *Conn) Close() error {
 		return nil
 	}
 	conn.closing = true
-	if conn.root != nil {
-		conn.root.Kill()
-	}
 	conn.mutex.Unlock()
 
 	// Wait for any outstanding server requests to complete
 	// and write their replies before closing the codec.
 	conn.srvPending.Wait()
 
+	conn.mutex.Lock()
+	if conn.root != nil {
+		conn.root.Kill()
+	}
+	conn.mutex.Unlock()
+
 	// Closing the codec should cause the input loop to terminate.
 	if err := conn.codec.Close(); err != nil {
 		logger.Debugf("error closing codec: %v", err)