Merge pull request #703 from rabbitmq/rabbitmq-dotnet-client-681

Correctly merge fix for #681

Author: lukebakken

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

@@ -254,6 +254,7 @@ public event EventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryEr
                 }
             }
         }
+
         public string ClientProvidedName { get; private set; }
 
         public ushort ChannelMax

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

@@ -79,9 +79,8 @@ public class SocketFrameHandler : IFrameHandler
         private readonly ITcpClient m_socket;
         private readonly NetworkBinaryWriter m_writer;
         private readonly object _semaphore = new object();
-        private readonly object _sslStreamLock = new object();
+        private readonly object _streamLock = new object();
         private bool _closed;
-        private bool _ssl = false;
         public SocketFrameHandler(AmqpTcpEndpoint endpoint,
             Func<AddressFamily, ITcpClient> socketFactory,
             TimeSpan connectionTimeout, TimeSpan readTimeout, TimeSpan writeTimeout)
@@ -112,7 +111,6 @@ public SocketFrameHandler(AmqpTcpEndpoint endpoint,
                 try
                 {
                     netstream = SslHelper.TcpUpgrade(netstream, endpoint.Ssl);
-                    _ssl = true;
                 }
                 catch (Exception)
                 {
@@ -249,14 +247,7 @@ public void WriteFrameSet(IList<OutboundFrame> frames)
 
         private void Write(ArraySegment<byte> bufferSegment)
         {
-            if(_ssl)
-            {
-                lock (_sslStreamLock)
-                {
-                    m_writer.Write(bufferSegment.Array, bufferSegment.Offset, bufferSegment.Count);
-                }
-            }
-            else
+            lock (_streamLock)
             {
                 m_writer.Write(bufferSegment.Array, bufferSegment.Offset, bufferSegment.Count);
             }