* Add _disposed check in AutorecoveringConnection

* Cosmetic `ConfigureAwait(false)`
rabbitmq · Jan 13, 2025 · 1cf0540 · 1cf0540
1 parent 2d1b15c
commit 1cf0540
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.cs b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.cs
@@ -270,10 +270,23 @@ await RecordChannelAsync(autorecoveringChannel, channelsSemaphoreHeld: false, ca
             return autorecoveringChannel;
         }
 
-        public void Dispose() => DisposeAsync().AsTask().GetAwaiter().GetResult();
+        public void Dispose()
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            DisposeAsync().AsTask().GetAwaiter().GetResult();
+        }
 
         public async ValueTask DisposeAsync()
         {
+            if (_disposed)
+            {
+                return;
+            }
+
             if (IsDisposing)
             {
                 return;

diff --git a/projects/RabbitMQ.Client/Impl/Channel.cs b/projects/RabbitMQ.Client/Impl/Channel.cs
@@ -591,7 +591,8 @@ protected virtual async ValueTask DisposeAsyncCore()
             {
                 if (IsOpen)
                 {
-                    await this.AbortAsync().ConfigureAwait(false);
+                    await this.AbortAsync()
+                        .ConfigureAwait(false);
                 }
 
                 if (_serverOriginatedChannelCloseTcs is not null)