Merge pull request #139 from hdonnay/bug/subscription-close

stomp: fix Unsubscribe race
go-stomp · Oct 24, 2024 · 80a8c9f · 80a8c9f
2 parents 9a13a1a + 9165d8a
commit 80a8c9f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/subscription.go b/subscription.go
@@ -102,8 +102,12 @@ func (s *Subscription) Unsubscribe(opts ...func(*frame.Frame) error) error {
 	for atomic.LoadInt32(&s.state) != subStateClosed {
 		err = waitWithTimeout(s.closeCond, s.unsubscribeReceiptTimeout)
 		if err != nil && errors.Is(err, &ErrUnsubscribeReceiptTimeout) {
-			msg := s.subscriptionErrorMessage("channel unsubscribe receipt timeout")
-			s.C <- msg
+			// The [closeCond.Broadcast] can race with the timeout, so make sure
+			// the channel is still available.
+			if atomic.LoadInt32(&s.state) != subStateClosed {
+				msg := s.subscriptionErrorMessage("channel unsubscribe receipt timeout")
+				s.C <- msg
+			}
 			return err
 		}
 	}