Merge pull request #1709 from danielmarbach/try-add

lukebakken · web-flow · commit e51f6bcb9d60 · 2024-10-23T09:30:49.000-07:00
Safeguarding against duplicate sequence numbers
diff --git a/projects/RabbitMQ.Client/Impl/Channel.PublisherConfirms.cs b/projects/RabbitMQ.Client/Impl/Channel.PublisherConfirms.cs
@@ -295,7 +295,10 @@ await _confirmSemaphore.WaitAsync(cancellationToken)
                 if (_publisherConfirmationTrackingEnabled)
                 {
                     publisherConfirmationTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-                    _confirmsTaskCompletionSources[publishSequenceNumber] = publisherConfirmationTcs;
+                    if (!_confirmsTaskCompletionSources.TryAdd(publishSequenceNumber, publisherConfirmationTcs))
+                    {
+                        throw new InvalidOperationException($"Failed to track the publisher confirmation for sequence number '{publishSequenceNumber}' because it already exists.");
+                    }
                 }
 
                 _nextPublishSeqNo++;

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,10 @@ await _confirmSemaphore.WaitAsync(cancellationToken)`
`295`	`295`	`if (_publisherConfirmationTrackingEnabled)`
`296`	`296`	`{`
`297`	`297`	`publisherConfirmationTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);`
`298`		`- _confirmsTaskCompletionSources[publishSequenceNumber] = publisherConfirmationTcs;`
	`298`	`+ if (!_confirmsTaskCompletionSources.TryAdd(publishSequenceNumber, publisherConfirmationTcs))`
	`299`	`+ {`
	`300`	`+ throw new InvalidOperationException($"Failed to track the publisher confirmation for sequence number '{publishSequenceNumber}' because it already exists.");`
	`301`	`+ }`
`299`	`302`	`}`
`300`	`303`
`301`	`304`	`_nextPublishSeqNo++;`