Backed out changeset 3384544076b9

Emile Joubert · Emile Joubert · commit ff0138fe36f3 · 2012-01-17T17:47:37.000Z
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs
@@ -535,6 +535,7 @@ public void HeartbeatWriteLoop()
             }
             
             TerminateMainloop();
+            FinishClose();
         }
         
         public void HeartbeatReadLoop()
@@ -562,6 +563,7 @@ public void HeartbeatReadLoop()
             }
             
             TerminateMainloop();
+            FinishClose();
         }
         
         public void NotifyHeartbeatThread()
@@ -675,7 +677,7 @@ public void MainLoopIteration()
             }
         }
         
-        // Only call at the end of the Mainloop
+        // Only call at the end of the Mainloop or HeartbeatLoop
         public void FinishClose()
         {
             // Notify hearbeat loops that they can leave
@@ -966,6 +968,7 @@ protected void StartAndTune()
             if (!serverVersion.Equals(Protocol.Version))
             {
                 TerminateMainloop();
+                FinishClose();
                 throw new ProtocolVersionMismatchException(Protocol.MajorVersion,
                                                            Protocol.MinorVersion,
                                                            serverVersion.Major,

Original file line number	Diff line number	Diff line change
`@@ -535,6 +535,7 @@ public void HeartbeatWriteLoop()`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`TerminateMainloop();`
	`538`	`+ FinishClose();`
`538`	`539`	`}`
`539`	`540`
`540`	`541`	`public void HeartbeatReadLoop()`
`@@ -562,6 +563,7 @@ public void HeartbeatReadLoop()`
`562`	`563`	`}`
`563`	`564`
`564`	`565`	`TerminateMainloop();`
	`566`	`+ FinishClose();`
`565`	`567`	`}`
`566`	`568`
`567`	`569`	`public void NotifyHeartbeatThread()`
`@@ -675,7 +677,7 @@ public void MainLoopIteration()`
`675`	`677`	`}`
`676`	`678`	`}`
`677`	`679`
`678`		`- // Only call at the end of the Mainloop`
	`680`	`+ // Only call at the end of the Mainloop or HeartbeatLoop`
`679`	`681`	`public void FinishClose()`
`680`	`682`	`{`
`681`	`683`	`// Notify hearbeat loops that they can leave`
`@@ -966,6 +968,7 @@ protected void StartAndTune()`
`966`	`968`	`if (!serverVersion.Equals(Protocol.Version))`
`967`	`969`	`{`
`968`	`970`	`TerminateMainloop();`
	`971`	`+ FinishClose();`
`969`	`972`	`throw new ProtocolVersionMismatchException(Protocol.MajorVersion,`
`970`	`973`	`Protocol.MinorVersion,`
`971`	`974`	`serverVersion.Major,`