Merge bug21201 into default

Author: Emile Joubert

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;
@@ -511,9 +512,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()
@@ -619,6 +620,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,
@@ -650,7 +659,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 !=
@@ -986,7 +995,7 @@ public void Open(bool insist)
             m_clientProperties = new Hashtable(m_factory.ClientProperties);
 
             // FIXME: check that PLAIN is supported.
-            // FIXME: parse out locales properly!
+            // FIXME: parse out locales properly!
             ConnectionTuneDetails connectionTune = default(ConnectionTuneDetails);
             try
             {

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

@@ -56,6 +56,7 @@
 //---------------------------------------------------------------------------
 using System;
 using System.IO;
+using System.Net.Sockets;
 
 using RabbitMQ.Util;
 using RabbitMQ.Client.Exceptions;
@@ -103,7 +104,21 @@ public static Frame ReadFrom(NetworkBinaryReader reader)
             int type;
             int channel;
 
-            type = reader.ReadByte();
+            try
+            {
+                type = reader.ReadByte();
+            }
+            catch (IOException ioe)
+            {
+                // If it's a WSAETIMEDOUT SocketException, unwrap it.
+                // This might happen when the limit of half-open connections is
+                // reached.
+                if (ioe.InnerException == null ||
+                    !(ioe.InnerException is SocketException) ||
+                    ((SocketException)ioe.InnerException).SocketErrorCode != SocketError.TimedOut)
+                    throw ioe;
+                throw ioe.InnerException;
+            }
 
             if (type == 'A')
             {
@@ -177,11 +192,11 @@ 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);
+            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);
         }
 
         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);
             }
         }