Prevent concurrent recoveries and extra connections after recovery

Author: michaelklishin

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

@@ -92,22 +92,28 @@ public void init()
             var self = this;
             ConnectionShutdownEventHandler recoveryListener = (_, args) =>
                 {
-                    if(ShouldTriggerConnectionRecovery(args))
+                    lock(self)
                     {
-                        try
+                        if(ShouldTriggerConnectionRecovery(args))
                         {
-                            self.BeginAutomaticRecovery();
-                        } catch (Exception e)
-                        {
-                            // TODO: logging
-                            Console.WriteLine("BeginAutomaticRecovery() failed: {0}", e);
-                        }
+                            try
+                            {
+                                self.BeginAutomaticRecovery();
+                            } catch (Exception e)
+                            {
+                                // TODO: logging
+                                Console.WriteLine("BeginAutomaticRecovery() failed: {0}", e);
+                            }
+                        }                        
                     }
                 };
             lock(this.m_eventLock)
             {
                 this.ConnectionShutdown += recoveryListener;
-                this.m_recordedShutdownEventHandlers.Add(recoveryListener);
+                if(!this.m_recordedShutdownEventHandlers.Contains(recoveryListener))
+                {
+                    this.m_recordedShutdownEventHandlers.Add(recoveryListener);
+                }
             }
         }
 
@@ -837,7 +843,7 @@ public void DeleteRecordedBinding(RecordedBinding rb)
             }
         }
 
-       public void RecordConsumer(string name, RecordedConsumer c)
+        public void RecordConsumer(string name, RecordedConsumer c)
         {
             lock(this.m_recordedEntitiesLock)
             {

projects/client/Unit/src/unit/TestConnectionRecovery.cs

@@ -518,6 +518,7 @@ public void TestConsumerRecoveryWithManyConsumers()
         }
 
         [Test]
+        [Category("Focus")]
         public void TestConsumerRecoveryOnClientNamedQueueWithOneRecovery()
         {
             var c    = CreateAutorecoveringConnection();
@@ -535,6 +536,10 @@ public void TestConsumerRecoveryOnClientNamedQueueWithOneRecovery()
                 latestName = current;
             };
 
+            CloseAndWaitForRecovery(c);
+            AssertConsumerCount(m, latestName, 1);
+            CloseAndWaitForRecovery(c);
+            AssertConsumerCount(m, latestName, 1);
             CloseAndWaitForRecovery(c);
             AssertConsumerCount(m, latestName, 1);