Prevent race by reordering

Author: Emile Joubert

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

@@ -972,8 +972,8 @@ public void HandleBasicGetEmpty()
         public void HandleBasicRecoverOk()
         {
             SimpleBlockingRpcContinuation k = (SimpleBlockingRpcContinuation)m_continuationQueue.Next();
-            k.HandleCommand(null);
             OnBasicRecoverOk(new EventArgs());
+            k.HandleCommand(null);
         }
 
         public abstract ConnectionTuneDetails ConnectionStartOk(IDictionary clientProperties,

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

@@ -59,7 +59,6 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Threading;
 using System.Collections;
 
 using RabbitMQ.Client.Impl;
@@ -123,7 +122,6 @@ public void TestRecoverCallback()
             int callbackCount = 0;
             Channel.BasicRecoverOk += (sender, eventArgs) => callbackCount++;
             Channel.BasicRecover(false);
-            Thread.Sleep(100);
             Assert.AreEqual(1, callbackCount);
         }