merging bug 22114 into default

Author: Matthew Sackman

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

@@ -81,10 +81,15 @@ public SocketFrameHandler_0_9(AmqpTcpEndpoint endpoint)
             // disable Nagle's algorithm, for more consistently low latency 
             m_socket.NoDelay = true;
 
-            Stream netstream = endpoint.Ssl.Enabled ?
-                SslHelper.TcpUpgrade(m_socket.GetStream(), endpoint.Ssl) :
-                m_socket.GetStream();
-
+            Stream netstream = m_socket.GetStream();
+            if (endpoint.Ssl.Enabled) {
+                try {
+                    netstream = SslHelper.TcpUpgrade(netstream, endpoint.Ssl);
+                } catch (Exception) {
+                    Close();
+                    throw;
+                }
+            }
             m_reader = new NetworkBinaryReader(new BufferedStream(netstream));
             m_writer = new NetworkBinaryWriter(new BufferedStream(netstream));
         }