@@ -299,13 +299,12 @@ private async ValueTask RecoverExchangesAsync(IConnection connection,
299
299
{
300
300
try
301
301
{
302
- using ( IChannel ch = await connection . CreateChannelAsync ( cancellationToken : cancellationToken ) . ConfigureAwait ( false ) )
303
- {
304
- await recordedExchange . RecoverAsync ( ch , cancellationToken )
305
- . ConfigureAwait ( false ) ;
306
- await ch . CloseAsync ( cancellationToken )
307
- . ConfigureAwait ( false ) ;
308
- }
302
+ var channel = await connection . CreateChannelAsync ( cancellationToken : cancellationToken ) . ConfigureAwait ( false ) ;
303
+ await using var _ = channel . ConfigureAwait ( false ) ;
304
+ await recordedExchange . RecoverAsync ( channel , cancellationToken )
305
+ . ConfigureAwait ( false ) ;
306
+ await channel . CloseAsync ( cancellationToken )
307
+ . ConfigureAwait ( false ) ;
309
308
}
310
309
catch ( Exception ex )
311
310
{
@@ -351,11 +350,12 @@ private async Task RecoverQueuesAsync(IConnection connection,
351
350
try
352
351
{
353
352
string newName = string . Empty ;
354
- using ( IChannel ch = await connection . CreateChannelAsync ( cancellationToken : cancellationToken ) . ConfigureAwait ( false ) )
353
+ var channel = await connection . CreateChannelAsync ( cancellationToken : cancellationToken ) . ConfigureAwait ( false ) ;
354
+ await using ( channel . ConfigureAwait ( false ) )
355
355
{
356
- newName = await recordedQueue . RecoverAsync ( ch , cancellationToken )
356
+ newName = await recordedQueue . RecoverAsync ( channel , cancellationToken )
357
357
. ConfigureAwait ( false ) ;
358
- await ch . CloseAsync ( cancellationToken )
358
+ await channel . CloseAsync ( cancellationToken )
359
359
. ConfigureAwait ( false ) ;
360
360
}
361
361
string oldName = recordedQueue . Name ;
@@ -463,13 +463,12 @@ private async ValueTask RecoverBindingsAsync(IConnection connection,
463
463
{
464
464
try
465
465
{
466
- using ( IChannel ch = await connection . CreateChannelAsync ( cancellationToken : cancellationToken ) . ConfigureAwait ( false ) )
467
- {
468
- await binding . RecoverAsync ( ch , cancellationToken )
469
- . ConfigureAwait ( false ) ;
470
- await ch . CloseAsync ( cancellationToken )
471
- . ConfigureAwait ( false ) ;
472
- }
466
+ var channel = await connection . CreateChannelAsync ( cancellationToken : cancellationToken ) . ConfigureAwait ( false ) ;
467
+ await using var _ = channel . ConfigureAwait ( false ) ;
468
+ await binding . RecoverAsync ( channel , cancellationToken )
469
+ . ConfigureAwait ( false ) ;
470
+ await channel . CloseAsync ( cancellationToken )
471
+ . ConfigureAwait ( false ) ;
473
472
}
474
473
catch ( Exception ex )
475
474
{
0 commit comments