Close socket only once

Emile Joubert · Emile Joubert · commit 8f87098d4f3c · 2012-01-09T15:35:46.000Z
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs
@@ -535,7 +535,6 @@ public void HeartbeatWriteLoop()
             }
             
             TerminateMainloop();
-            FinishClose();
         }
         
         public void HeartbeatReadLoop()
@@ -563,7 +562,6 @@ public void HeartbeatReadLoop()
             }
             
             TerminateMainloop();
-            FinishClose();
         }
         
         public void NotifyHeartbeatThread()
@@ -677,7 +675,7 @@ public void MainLoopIteration()
             }
         }
         
-        // Only call at the end of the Mainloop or HeartbeatLoop
+        // Only call at the end of the Mainloop
         public void FinishClose()
         {
             // Notify hearbeat loops that they can leave
@@ -968,7 +966,6 @@ 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,7 +535,6 @@ public void HeartbeatWriteLoop()`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`TerminateMainloop();`
`538`		`- FinishClose();`
`539`	`538`	`}`
`540`	`539`
`541`	`540`	`public void HeartbeatReadLoop()`
`@@ -563,7 +562,6 @@ public void HeartbeatReadLoop()`
`563`	`562`	`}`
`564`	`563`
`565`	`564`	`TerminateMainloop();`
`566`		`- FinishClose();`
`567`	`565`	`}`
`568`	`566`
`569`	`567`	`public void NotifyHeartbeatThread()`
`@@ -677,7 +675,7 @@ public void MainLoopIteration()`
`677`	`675`	`}`
`678`	`676`	`}`
`679`	`677`
`680`		`- // Only call at the end of the Mainloop or HeartbeatLoop`
	`678`	`+ // Only call at the end of the Mainloop`
`681`	`679`	`public void FinishClose()`
`682`	`680`	`{`
`683`	`681`	`// Notify hearbeat loops that they can leave`
`@@ -968,7 +966,6 @@ protected void StartAndTune()`
`968`	`966`	`if (!serverVersion.Equals(Protocol.Version))`
`969`	`967`	`{`
`970`	`968`	`TerminateMainloop();`
`971`		`- FinishClose();`
`972`	`969`	`throw new ProtocolVersionMismatchException(Protocol.MajorVersion,`
`973`	`970`	`Protocol.MinorVersion,`
`974`	`971`	`serverVersion.Major,`