Inline and simplify

Author: danielmarbach

projects/RabbitMQ.Client/Impl/Channel.PublisherConfirms.cs

@@ -54,34 +54,21 @@ internal partial class Channel : IChannel, IRecoverable
 
         private sealed class PublisherConfirmationInfo : IDisposable
         {
-            private readonly SemaphoreSlim _semaphore;
             private readonly TaskCompletionSource<bool>? _publisherConfirmationTcs;
             private readonly RateLimitLease? _lease;
-            private bool _semaphoreReleased;
 
             internal PublisherConfirmationInfo(
-                SemaphoreSlim semaphore,
                 ulong publishSequenceNumber,
                 TaskCompletionSource<bool>? publisherConfirmationTcs,
                 RateLimitLease? lease)
             {
-                _semaphore = semaphore;
                 PublishSequenceNumber = publishSequenceNumber;
                 _publisherConfirmationTcs = publisherConfirmationTcs;
                 _lease = lease;
             }
 
             internal ulong PublishSequenceNumber { get; }
 
-            internal void ReleaseSemaphore()
-            {
-                if (!_semaphoreReleased)
-                {
-                    _semaphoreReleased = true;
-                    _semaphore.Release();
-                }
-            }
-
             internal async Task MaybeWaitForConfirmationAsync(CancellationToken cancellationToken)
             {
                 if (_publisherConfirmationTcs is not null)
@@ -106,7 +93,6 @@ internal bool MaybeHandleException(Exception ex)
 
             public void Dispose()
             {
-                ReleaseSemaphore();
                 _lease?.Dispose();
             }
         }
@@ -323,9 +309,11 @@ await _confirmSemaphore.WaitAsync(reason.CancellationToken)
                 }
             }
 
+            bool confirmSemaphoreAcquired;
             try
             {
                 await _confirmSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+                confirmSemaphoreAcquired = true;
             }
             catch (OperationCanceledException)
             {
@@ -341,16 +329,18 @@ await _confirmSemaphore.WaitAsync(reason.CancellationToken)
                 publisherConfirmationTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
                 if (!_confirmsTaskCompletionSources.TryAdd(publishSequenceNumber, publisherConfirmationTcs))
                 {
-                    _confirmSemaphore.Release();
+                    if (confirmSemaphoreAcquired)
+                    {
+                        _confirmSemaphore.Release();
+                    }
                     lease?.Dispose();
                     throw new InvalidOperationException($"Failed to track the publisher confirmation for sequence number '{publishSequenceNumber}' because it already exists.");
                 }
             }
 
             _nextPublishSeqNo++;
 
-            return new PublisherConfirmationInfo(_confirmSemaphore, publishSequenceNumber, publisherConfirmationTcs, lease);
-
+            return new PublisherConfirmationInfo(publishSequenceNumber, publisherConfirmationTcs, lease);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -384,7 +374,7 @@ private async Task MaybeEndPublisherConfirmationTrackingAsync(PublisherConfirmat
                 return;
             }
 
-            publisherConfirmationInfo.ReleaseSemaphore();
+            _confirmSemaphore.Release();
 
             try
             {