* I like _isDisposing better. So sue me!

* Move the `Interlocked.Exchange` code to a getter, for readability.
* Minor nullable change.

Author: lukebakken

projects/RabbitMQ.Client/Impl/AutorecoveringChannel.cs

@@ -49,7 +49,7 @@ internal sealed class AutorecoveringChannel : IChannel, IRecoverable
         private AutorecoveringConnection _connection;
         private RecoveryAwareChannel _innerChannel;
         private bool _disposed;
-        private int _disposeSignaled;
+        private int _isDisposing;
 
         private ushort _prefetchCountConsumer;
         private ushort _prefetchCountGlobal;
@@ -258,7 +258,7 @@ public override string ToString()
 
         public async ValueTask DisposeAsync()
         {
-            if (Interlocked.Exchange(ref _disposeSignaled, 1) != 0)
+            if (IsDisposing)
             {
                 return;
             }
@@ -495,5 +495,18 @@ private void ThrowIfDisposed()
             [DoesNotReturn]
             static void ThrowDisposed() => throw new ObjectDisposedException(typeof(AutorecoveringChannel).FullName);
         }
+
+        private bool IsDisposing
+        {
+            get
+            {
+                if (Interlocked.Exchange(ref _isDisposing, 1) != 0)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+        }
     }
 }

projects/RabbitMQ.Client/Impl/AutorecoveringConnection.cs

@@ -51,7 +51,7 @@ internal sealed partial class AutorecoveringConnection : IConnection
 
         private Connection _innerConnection;
         private bool _disposed;
-        private int _disposeSignaled;
+        private int _isDisposing;
 
         private Connection InnerConnection
         {
@@ -274,7 +274,7 @@ await RecordChannelAsync(autorecoveringChannel, channelsSemaphoreHeld: false, ca
 
         public async ValueTask DisposeAsync()
         {
-            if (Interlocked.Exchange(ref _disposeSignaled, 1) != 0)
+            if (IsDisposing)
             {
                 return;
             }
@@ -315,5 +315,18 @@ private void ThrowIfDisposed()
             [DoesNotReturn]
             static void ThrowDisposed() => throw new ObjectDisposedException(typeof(AutorecoveringConnection).FullName);
         }
+
+        private bool IsDisposing
+        {
+            get
+            {
+                if (Interlocked.Exchange(ref _isDisposing, 1) != 0)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+        }
     }
 }

projects/RabbitMQ.Client/Impl/Channel.cs

@@ -64,7 +64,7 @@ internal partial class Channel : IChannel, IRecoverable
         internal readonly IConsumerDispatcher ConsumerDispatcher;
 
         private bool _disposed;
-        private int _disposeSignaled;
+        private int _isDisposing;
 
         public Channel(ISession session, CreateChannelOptions createChannelOptions)
         {
@@ -529,7 +529,7 @@ void IDisposable.Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-            if (Interlocked.Exchange(ref _disposeSignaled, 1) != 0)
+            if (IsDisposing)
             {
                 return;
             }
@@ -567,7 +567,7 @@ await DisposeAsyncCore()
 
         protected virtual async ValueTask DisposeAsyncCore()
         {
-            if (Interlocked.Exchange(ref _disposeSignaled, 1) != 0)
+            if (IsDisposing)
             {
                 return;
             }
@@ -694,11 +694,12 @@ protected virtual ulong AdjustDeliveryTag(ulong deliveryTag)
 
         protected async Task<bool> HandleChannelCloseAsync(IncomingCommand cmd, CancellationToken cancellationToken)
         {
-            var serverOriginatedChannelCloseTcs = _serverOriginatedChannelCloseTcs;
+            TaskCompletionSource<bool>? serverOriginatedChannelCloseTcs = _serverOriginatedChannelCloseTcs;
             if (serverOriginatedChannelCloseTcs is null)
             {
                 // Attempt to assign the new TCS only if _tcs is still null
-                _ = Interlocked.CompareExchange(ref _serverOriginatedChannelCloseTcs, new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously), null);
+                _ = Interlocked.CompareExchange(ref _serverOriginatedChannelCloseTcs,
+                    new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously), null);
             }
 
             try
@@ -720,12 +721,12 @@ await ModelSendAsync(in method, cancellationToken)
                 await Session.NotifyAsync(cancellationToken)
                     .ConfigureAwait(false);
 
-                _serverOriginatedChannelCloseTcs.TrySetResult(true);
+                _serverOriginatedChannelCloseTcs?.TrySetResult(true);
                 return true;
             }
             catch (Exception ex)
             {
-                _serverOriginatedChannelCloseTcs.TrySetException(ex);
+                _serverOriginatedChannelCloseTcs?.TrySetException(ex);
                 throw;
             }
         }
@@ -1647,5 +1648,18 @@ private Task<bool> DispatchCommandAsync(IncomingCommand cmd, CancellationToken c
                     }
             }
         }
+
+        private bool IsDisposing
+        {
+            get
+            {
+                if (Interlocked.Exchange(ref _isDisposing, 1) != 0)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+        }
     }
 }

projects/RabbitMQ.Client/Impl/Connection.cs

@@ -47,7 +47,7 @@ namespace RabbitMQ.Client.Framing
     internal sealed partial class Connection : IConnection
     {
         private bool _disposed;
-        private int _disposeSignaled;
+        private int _isDisposing;
         private volatile bool _closed;
 
         private readonly ConnectionConfig _config;
@@ -491,7 +491,7 @@ internal ValueTask WriteAsync(RentedMemory frames, CancellationToken cancellatio
 
         public async ValueTask DisposeAsync()
         {
-            if (Interlocked.Exchange(ref _disposeSignaled, 1) != 0)
+            if (IsDisposing)
             {
                 return;
             }
@@ -544,5 +544,18 @@ private static void ThrowAlreadyClosedException(ShutdownEventArgs closeReason)
         {
             throw new AlreadyClosedException(closeReason);
         }
+
+        private bool IsDisposing
+        {
+            get
+            {
+                if (Interlocked.Exchange(ref _isDisposing, 1) != 0)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+        }
     }
 }