Merge pull request #1205 from MIVerTFT/fix-unbind

Fix incorrect unbind queue after recovery connection

Author: michaelklishin

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

@@ -946,13 +946,27 @@ private void PropagateQueueNameChangeToBindings(string oldName, string newName)
         {
             lock (_recordedEntitiesLock)
             {
+                var recreateEntityList = new List<RecordedBinding>();
                 foreach (RecordedBinding b in _recordedBindings.Keys)
                 {
                     if (b.Destination.Equals(oldName))
                     {
-                        b.Destination = newName;
+                        recreateEntityList.Add(b);
                     }
                 }
+
+                foreach (var recordedBinding in recreateEntityList)
+                {
+                    var newRb = recordedBinding is RecordedQueueBinding
+                        ? (RecordedBinding)new RecordedQueueBinding()
+                        : new RecordedExchangeBinding();
+                    newRb.WithArguments(recordedBinding.Arguments)
+                        .WithDestination(newName)
+                        .WithRoutingKey(recordedBinding.RoutingKey)
+                        .WithSource(recordedBinding.Source);
+                    _recordedBindings.Remove(recordedBinding);
+                    _recordedBindings.Add(newRb, 0);
+                }
             }
         }
 

projects/Unit/TestConnectionRecovery.cs

@@ -756,6 +756,35 @@ public void TestServerNamedQueueRecovery()
 
             Model.QueueDeclarePassive(nameAfter);
         }
+        [Test]
+        public void TestUnbindQueueAfterRecoveryConnection()
+        {
+            string q = Model.QueueDeclare("", false, true, true, null).QueueName;
+            string x = "amq.fanout";
+            Model.QueueBind(q, x, "");
+
+            string nameBefore = q;
+            string nameAfter = null;
+
+            var latch = new ManualResetEventSlim(false);
+            var connection = (AutorecoveringConnection)Conn;
+            connection.RecoverySucceeded += (source, ea) => latch.Set();
+            connection.QueueNameChangeAfterRecovery += (source, ea) => { nameAfter = ea.NameAfter; };
+
+            CloseAndWaitForRecovery();
+            Wait(latch);
+
+            Assert.IsNotNull(nameAfter);
+            Assert.IsTrue(nameBefore.StartsWith("amq."));
+            Assert.IsTrue(nameAfter.StartsWith("amq."));
+            Assert.AreNotEqual(nameBefore, nameAfter);
+            Model.QueueUnbind(nameAfter,x,"");
+            Model.QueueDeleteNoWait(nameAfter);
+            latch.Reset();
+            CloseAndWaitForRecovery();
+            Wait(latch);
+            //Model.QueueDeclarePassive(nameAfter);
+        }
 
         [Test]
         public void TestShutdownEventHandlersRecoveryOnConnection()