Frame class now throws SocketException on reader or writer IOExceptions caused by a SocketException; SocketException causes the connection main loop to die and propagates to construct ShutdownEventArgs with it - that causes the calling thread to throw an OperationInterruptedException which includes the SocketException's message

Author: Vlad Ionescu

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

@@ -56,6 +56,7 @@
 //---------------------------------------------------------------------------
 using System;
 using System.IO;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Collections;
@@ -484,9 +485,9 @@ public void TerminateMainloop()
 
         public void StartMainLoop()
         {
-            Thread mainloopThread = new Thread(new ThreadStart(MainLoop));
-            mainloopThread.Name = "AMQP Connection " + Endpoint.ToString();
-            mainloopThread.Start();
+            Thread mainLoopThread = new Thread(new ThreadStart(MainLoop));
+            mainLoopThread.Name = "AMQP Connection " + Endpoint.ToString();
+            mainLoopThread.Start();
         }
 
         public void StartHeartbeatLoops()
@@ -594,6 +595,14 @@ public void MainLoop()
             {
                 shutdownCleanly = HardProtocolExceptionHandler(hpe);
             }
+            catch (SocketException se)
+            {
+                // Possibly due to handshake timeout
+                HandleMainLoopException(new ShutdownEventArgs(ShutdownInitiator.Library,
+                                                          0,
+                                                          "Socket exception",
+                                                          se));
+            }
             catch (Exception ex)
             {
                 HandleMainLoopException(new ShutdownEventArgs(ShutdownInitiator.Library,
@@ -625,7 +634,7 @@ public void MainLoopIteration()
                 // counter.
                 return;
             }
-
+            
             if (frame.Channel == 0) {
                 // In theory, we could get non-connection.close-ok
                 // frames here while we're quiescing (m_closeReason !=

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

@@ -103,7 +103,17 @@ public static Frame ReadFrom(NetworkBinaryReader reader)
             int type;
             int channel;
 
-            type = reader.ReadByte();
+            try
+            {
+                type = reader.ReadByte();
+            }
+            catch (IOException ioe)
+            {
+                if (ioe.InnerException != null)
+                    throw ioe.InnerException;
+                else
+                    throw;
+            }
 
             if (type == 'A')
             {
@@ -177,11 +187,21 @@ public void FinishWriting()
         public void WriteTo(NetworkBinaryWriter writer)
         {
             FinishWriting();
-            writer.Write((byte)m_type);
-            writer.Write((ushort)m_channel);
-            writer.Write((uint)m_payload.Length);
-            writer.Write((byte[])m_payload);
-            writer.Write((byte)CommonFraming.Constants.FrameEnd);
+            try
+            {
+                writer.Write((byte) m_type);
+                writer.Write((ushort) m_channel);
+                writer.Write((uint) m_payload.Length);
+                writer.Write((byte[]) m_payload);
+                writer.Write((byte) CommonFraming.Constants.FrameEnd);
+            }
+            catch(IOException ioe)
+            {
+                if (ioe.InnerException != null)
+                    throw ioe.InnerException;
+                else
+                    throw;
+            }
         }
 
         public NetworkBinaryReader GetReader()

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

@@ -131,7 +131,7 @@ public Frame ReadFrame()
         {
             lock (m_reader)
             {
-                    return Frame.ReadFrom(m_reader);
+                return Frame.ReadFrom(m_reader);
             }
         }