Merge pull request #1203 from mot256/6.x

Fix perpetual auto-recovery problem

(cherry picked from commit 480c739)

Author: michaelklishin

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

@@ -545,7 +545,7 @@ public void MaybeDeleteRecordedAutoDeleteExchange(string exchange)
                     // if it is auto-deleted. See bug 26364.
                     if ((rx != null) && rx.IsAutoDelete)
                     {
-                        _recordedExchanges.Remove(exchange);
+                        DeleteRecordedExchange(exchange);
                     }
                 }
             }
@@ -562,7 +562,7 @@ public void MaybeDeleteRecordedAutoDeleteQueue(string queue)
                     // if it is auto-deleted. See bug 26364.
                     if ((rq != null) && rq.IsAutoDelete)
                     {
-                        _recordedQueues.Remove(queue);
+                        DeleteRecordedQueue(queue);
                     }
                 }
             }
@@ -900,7 +900,7 @@ private void HandleTopologyRecoveryException(TopologyRecoveryException e)
 
         private void PropagateQueueNameChangeToBindings(string oldName, string newName)
         {
-            lock (_recordedBindings)
+            lock (_recordedEntitiesLock)
             {
                 foreach (RecordedBinding b in _recordedBindings.Keys)
                 {
@@ -929,7 +929,7 @@ private void PropagateQueueNameChangeToConsumers(string oldName, string newName)
         private void RecoverBindings()
         {
             Dictionary<RecordedBinding, byte> recordedBindingsCopy;
-            lock (_recordedBindings)
+            lock (_recordedEntitiesLock)
             {
                 recordedBindingsCopy = new Dictionary<RecordedBinding, byte>(_recordedBindings);
             }