Maxing sure continuations are consistently disposed because they tend…

… to create timer based cancellation token sources and linked tokens
rabbitmq · Dec 7, 2024 · 36ac973 · 36ac973
1 parent 6670384
commit 36ac973
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 187 deletions.
diff --git a/projects/RabbitMQ.Client/Impl/Channel.PublisherConfirms.cs b/projects/RabbitMQ.Client/Impl/Channel.PublisherConfirms.cs
@@ -131,38 +131,27 @@ private async Task MaybeConfirmSelect(CancellationToken cancellationToken)
             if (_publisherConfirmationsEnabled)
             {
                 // NOTE: _rpcSemaphore is held
-                bool enqueued = false;
-                var k = new ConfirmSelectAsyncRpcContinuation(ContinuationTimeout, cancellationToken);
+                using var k = new ConfirmSelectAsyncRpcContinuation(ContinuationTimeout, cancellationToken);
 
-                try
+                if (_nextPublishSeqNo == 0UL)
                 {
-                    if (_nextPublishSeqNo == 0UL)
+                    if (_publisherConfirmationTrackingEnabled)
                     {
-                        if (_publisherConfirmationTrackingEnabled)
-                        {
-                            _confirmsTaskCompletionSources.Clear();
-                        }
-                        _nextPublishSeqNo = 1;
+                        _confirmsTaskCompletionSources.Clear();
                     }
+                    _nextPublishSeqNo = 1;
+                }
 
-                    enqueued = Enqueue(k);
+                Enqueue(k);
 
-                    var method = new ConfirmSelect(false);
-                    await ModelSendAsync(in method, k.CancellationToken)
-                        .ConfigureAwait(false);
+                var method = new ConfirmSelect(false);
+                await ModelSendAsync(in method, k.CancellationToken)
+                    .ConfigureAwait(false);
 
-                    bool result = await k;
-                    Debug.Assert(result);
+                bool result = await k;
+                Debug.Assert(result);
 
-                    return;
-                }
-                finally
-                {
-                    if (false == enqueued)
-                    {
-                        k.Dispose();
-                    }
-                }
+                return;
             }
         }