Only delete recorded consumers when AutorecoveringModel is explicitly closed

Author: lukebakken

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

@@ -661,11 +661,22 @@ public override string ToString()
 
         public void UnregisterModel(AutorecoveringModel model)
         {
-            lock (_recordedEntitiesLock)
+            lock (_models)
             {
-                foreach (string ct in model.ConsumerTags)
+                _models.Remove(model);
+            }
+        }
+
+        public void UnregisterModel(AutorecoveringModel model, bool shouldDeleteRecordedConsumers)
+        {
+            if (shouldDeleteRecordedConsumers)
+            {
+                lock (_recordedEntitiesLock)
                 {
-                    DeleteRecordedConsumer(ct);
+                    foreach (string ct in model.ConsumerTags)
+                    {
+                        DeleteRecordedConsumer(ct);
+                    }
                 }
             }
 

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

@@ -466,7 +466,7 @@ public void Close(ushort replyCode, string replyText, bool abort)
             }
             finally
             {
-                _connection.UnregisterModel(this);
+                _connection.UnregisterModel(this, true);
             }
         }
 
@@ -483,7 +483,7 @@ public void Close(ShutdownEventArgs reason, bool abort)
             }
             finally
             {
-                _connection.UnregisterModel(this);
+                _connection.UnregisterModel(this, true);
             }
         }
 

projects/Unit/TestConnectionRecovery.cs

@@ -30,7 +30,6 @@
 //---------------------------------------------------------------------------
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
 
@@ -825,7 +824,7 @@ public void TestUnbindQueueAfterRecoveryConnection()
             Assert.IsTrue(nameBefore.StartsWith("amq."));
             Assert.IsTrue(nameAfter.StartsWith("amq."));
             Assert.AreNotEqual(nameBefore, nameAfter);
-            Model.QueueUnbind(nameAfter,x,"");
+            Model.QueueUnbind(nameAfter, x, "");
             Model.QueueDeleteNoWait(nameAfter);
             latch.Reset();
             CloseAndWaitForRecovery();