merge bug24650 into default (Socket closed multiple times with missed heartbeat)

Author: Alexandru Scvortov

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

@@ -550,9 +550,10 @@ public void HeartbeatReadLoop()
                 // Has to miss two full heartbeats to force socket close
                 if (m_missedHeartbeats > 1)
                 {
-                    EndOfStreamException eose = new EndOfStreamException(
-                                         "Heartbeat missing with heartbeat == " +
-                                         m_heartbeat + " seconds");
+                    String description = "Heartbeat missing with heartbeat == " +
+                                          m_heartbeat + " seconds";
+                    EndOfStreamException eose = new EndOfStreamException(description);
+                    m_shutdownReport.Add(new ShutdownReportEntry(description, eose));
                     HandleMainLoopException(new ShutdownEventArgs(
                                                           ShutdownInitiator.Library,
                                                           0,

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

@@ -59,6 +59,8 @@ public class SocketFrameHandler_0_9 : IFrameHandler
         public TcpClient m_socket;
         public NetworkBinaryReader m_reader;
         public NetworkBinaryWriter m_writer;
+        private bool m_closed = false;
+        private Object m_semaphore = new object();
 
         public SocketFrameHandler_0_9(AmqpTcpEndpoint endpoint)
         {
@@ -150,8 +152,15 @@ public void WriteFrame(Frame frame)
 
         public void Close()
         {
-            m_socket.LingerState = new LingerOption(true, SOCKET_CLOSING_TIMEOUT);
-            m_socket.Close();
+            lock (m_semaphore)
+            {
+                if (!m_closed)
+                {
+                    m_socket.LingerState = new LingerOption(true, SOCKET_CLOSING_TIMEOUT);
+                    m_socket.Close();
+                    m_closed = true;
+                }
+            }
         }
     }
 }