fixup

Author: lukebakken

projects/RabbitMQ.Client/Impl/Channel.cs

@@ -562,10 +562,9 @@ protected virtual void Dispose(bool disposing)
 
                 try
                 {
-                    if (IsOpen)
-                    {
-                        this.AbortAsync().GetAwaiter().GetResult();
-                    }
+                    MaybeAbort();
+
+                    MaybeDisposeOutstandingPublisherConfirmationsRateLimiter();
 
                     MaybeWaitForServerOriginatedClose();
                 }
@@ -576,7 +575,6 @@ protected virtual void Dispose(bool disposing)
                         ConsumerDispatcher.Dispose();
                         _rpcSemaphore.Dispose();
                         _confirmSemaphore.Dispose();
-                        _outstandingPublisherConfirmationsRateLimiter?.Dispose();
                     }
                     catch
                     {
@@ -607,17 +605,11 @@ protected virtual async ValueTask DisposeAsyncCore(bool disposing)
 
                 try
                 {
-                    if (IsOpen)
-                    {
-                        await this.AbortAsync()
-                            .ConfigureAwait(false);
-                    }
+                    await MaybeAbortAsync()
+                        .ConfigureAwait(false);
 
-                    if (_outstandingPublisherConfirmationsRateLimiter is not null)
-                    {
-                        await _outstandingPublisherConfirmationsRateLimiter.DisposeAsync()
-                            .ConfigureAwait(false);
-                    }
+                    await MaybeDisposeOutstandingPublisherConfirmationsRateLimiterAsync()
+                        .ConfigureAwait(false);
 
                     await MaybeWaitForServerOriginatedCloseAsync()
                         .ConfigureAwait(false);
@@ -1687,6 +1679,55 @@ private Task<bool> DispatchCommandAsync(IncomingCommand cmd, CancellationToken c
             }
         }
 
+        private void MaybeAbort()
+        {
+            if (IsOpen)
+            {
+                this.AbortAsync().GetAwaiter().GetResult();
+            }
+        }
+
+        private Task MaybeAbortAsync()
+        {
+            if (IsOpen)
+            {
+                return this.AbortAsync();
+            }
+            else
+            {
+                return Task.CompletedTask;
+            }
+        }
+
+        private void MaybeDisposeOutstandingPublisherConfirmationsRateLimiter()
+        {
+            if (_outstandingPublisherConfirmationsRateLimiter is not null)
+            {
+                try
+                {
+                    _outstandingPublisherConfirmationsRateLimiter.Dispose();
+                }
+                catch
+                {
+                }
+            }
+        }
+
+        private async Task MaybeDisposeOutstandingPublisherConfirmationsRateLimiterAsync()
+        {
+            if (_outstandingPublisherConfirmationsRateLimiter is not null)
+            {
+                try
+                {
+                    await _outstandingPublisherConfirmationsRateLimiter.DisposeAsync()
+                        .ConfigureAwait(false);
+                }
+                catch
+                {
+                }
+            }
+        }
+
         private void MaybeWaitForServerOriginatedClose()
         {
             if (_serverOriginatedChannelCloseTcs is not null)