Use the same await using syntax.

rabbitmq · Sep 19, 2024 · 68cc34e · 68cc34e
1 parent 0c627c5
commit 68cc34e
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recovery.cs b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recovery.cs
@@ -299,12 +299,14 @@ private async ValueTask RecoverExchangesAsync(IConnection connection,
             {
                 try
                 {
-                    var channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
-                    await using var _ = channel.ConfigureAwait(false);
-                    await recordedExchange.RecoverAsync(channel, cancellationToken)
-                        .ConfigureAwait(false);
-                    await channel.CloseAsync(cancellationToken)
-                        .ConfigureAwait(false);
+                    IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+                    await using (channel.ConfigureAwait(false))
+                    {
+                        await recordedExchange.RecoverAsync(channel, cancellationToken)
+                            .ConfigureAwait(false);
+                        await channel.CloseAsync(cancellationToken)
+                            .ConfigureAwait(false);
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -350,7 +352,7 @@ private async Task RecoverQueuesAsync(IConnection connection,
                 try
                 {
                     string newName = string.Empty;
-                    var channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+                    IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
                     await using (channel.ConfigureAwait(false))
                     {
                         newName = await recordedQueue.RecoverAsync(channel, cancellationToken)
@@ -463,12 +465,14 @@ private async ValueTask RecoverBindingsAsync(IConnection connection,
             {
                 try
                 {
-                    var channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
-                    await using var _ = channel.ConfigureAwait(false);
-                    await binding.RecoverAsync(channel, cancellationToken)
-                        .ConfigureAwait(false);
-                    await channel.CloseAsync(cancellationToken)
-                        .ConfigureAwait(false);
+                    IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+                    await using (channel.ConfigureAwait(false))
+                    {
+                        await binding.RecoverAsync(channel, cancellationToken)
+                            .ConfigureAwait(false);
+                        await channel.CloseAsync(cancellationToken)
+                            .ConfigureAwait(false);
+                    }
                 }
                 catch (Exception ex)
                 {