Merge branch 'lukebakken/fix-closereason' into stringallocations

Author: lukebakken

projects/RabbitMQ.Client/client/impl/AutorecoveringChannel.cs

@@ -200,12 +200,21 @@ await _connection.RecoverConsumersAsync(this, newChannel, recordedEntitiesSemaph
             _innerChannel.RunRecoveryEventHandlers(this);
         }
 
-        public Task CloseAsync(ushort replyCode, string replyText, bool abort,
+        public async Task CloseAsync(ushort replyCode, string replyText, bool abort,
             CancellationToken cancellationToken)
         {
             ThrowIfDisposed();
-            var args = new ShutdownEventArgs(ShutdownInitiator.Library, replyCode, replyText);
-            return CloseAsync(args, abort, cancellationToken);
+            try
+            {
+                await _innerChannel.CloseAsync(replyCode, replyText, abort, cancellationToken)
+                    .ConfigureAwait(false);
+            }
+            finally
+            {
+                await _connection.DeleteRecordedChannelAsync(this,
+                    channelsSemaphoreHeld: false, recordedEntitiesSemaphoreHeld: false)
+                        .ConfigureAwait(false);
+            }
         }
 
         public async Task CloseAsync(ShutdownEventArgs args, bool abort,

projects/Test/Applications/MassPublish/Program.cs

@@ -156,6 +156,7 @@ await publishChannel.BasicPublishAsync(exchange: ExchangeName, routingKey: Routi
             }
 
             await consumeChannel.CloseAsync();
+            await consumeConnection.CloseAsync();
         }
 
         private static void PublishChannel_BasicNacks(object sender, BasicNackEventArgs e)