Fix destroy handler race (#141)

rsocket · Jan 20, 2025 · 28d7b65 · 28d7b65
1 parent 0681b59
commit 28d7b65
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/internal/socket/duplex.go b/internal/socket/duplex.go
@@ -161,15 +161,11 @@ func (dc *DuplexConnection) destroyTransport() {
 }
 
 func (dc *DuplexConnection) destroyHandler(err error) {
-	// TODO: optimize callback map
-	var callbacks []callback
 	dc.messages.Range(func(_, value interface{}) bool {
-		callbacks = append(callbacks, value.(callback))
+		cb := value.(callback)
+		cb.stopWithError(err)
 		return true
 	})
-	for _, next := range callbacks {
-		next.stopWithError(err)
-	}
 }
 
 func (dc *DuplexConnection) destroyFragment() {