Add eventhandler for RecoverOk

Author: Emile Joubert

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -93,6 +93,10 @@ public interface IModel: IDisposable
         ///</remarks>
         event CallbackExceptionEventHandler CallbackException;
 
+        ///<summary>Signalled when a RecoverOk is received from the
+        ///server. </summary>
+        event BasicRecoverOkEventHandler BasicRecoverOk;
+
         ///<summary>Signalled when an unexpected message is delivered
         ///
         /// Under certain circumstances it is possible for a channel to receive a

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

@@ -82,6 +82,7 @@ public abstract class ModelBase : IFullModel
         private readonly object m_eventLock = new object();
         private BasicReturnEventHandler m_basicReturn;
         private CallbackExceptionEventHandler m_callbackException;
+        private BasicRecoverOkEventHandler m_basicRecoverOk;
 
         public ManualResetEvent m_flowControlBlock = new ManualResetEvent(true);
 
@@ -148,6 +149,24 @@ public event CallbackExceptionEventHandler CallbackException
             }
         }
 
+        public event BasicRecoverOkEventHandler BasicRecoverOk
+        {
+            add
+            {
+                lock (m_eventLock)
+                {
+                    m_basicRecoverOk += value;
+                }
+            }
+            remove
+            {
+                lock (m_eventLock)
+                {
+                    m_basicRecoverOk -= value;
+                }
+            }
+        }
+
         public IBasicConsumer DefaultConsumer { get; set; }
 
         public ISession m_session;
@@ -278,6 +297,31 @@ public virtual void OnCallbackException(CallbackExceptionEventArgs args)
                 }
             }
         }
+
+        public virtual void OnBasicRecoverOk(EventArgs args)
+        {
+            BasicRecoverOkEventHandler handler;
+            lock (m_eventLock)
+            {
+                handler = m_basicRecoverOk;
+            }
+            if (handler != null)
+            {
+                foreach (BasicRecoverOkEventHandler h in handler.GetInvocationList())
+                {
+                    try
+                    {
+                        h(this, args);
+                    }
+                    catch (Exception e)
+                    {
+                        CallbackExceptionEventArgs exnArgs = new CallbackExceptionEventArgs(e);
+                        exnArgs.Detail["context"] = "OnBasicRecoverOk";
+                        OnCallbackException(exnArgs);
+                    }
+                }
+            }
+        }
 
         public void Enqueue(IRpcContinuation k)
         {
@@ -754,6 +798,7 @@ public void BasicRecover(bool requeue)
             }
 
             k.GetReply();
+            OnBasicRecoverOk(new EventArgs());
         }
 
         public abstract void BasicQos(uint prefetchSize,

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

@@ -115,5 +115,15 @@ public void TestRecoverAfterCancel_()
             Assert.IsFalse(Event.Redelivered);
             Assert.IsTrue(Event2.Redelivered);
         }
+
+        [Test]
+        public void TestRecoverCallback()
+        {
+            int callbackCount = 0;
+            Channel.BasicRecoverOk += (sender, eventArgs) => callbackCount++;
+            Channel.BasicRecover(false);
+            Assert.AreEqual(1, callbackCount);
+        }
+
     }
 }