SocketFrameHandler_0_9 => SocketFrameHandler

Author: michaelklishin

projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs renamed to projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler.cs

@@ -48,7 +48,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    public class SocketFrameHandler_0_9 : IFrameHandler
+    public class SocketFrameHandler : IFrameHandler
     {
         public const int WSAEWOULDBLOCK = 10035;
         // ^^ System.Net.Sockets.SocketError doesn't exist in .NET 1.1
@@ -63,9 +63,9 @@ public class SocketFrameHandler_0_9 : IFrameHandler
         private bool m_closed = false;
         private Object m_semaphore = new object();
 
-        public SocketFrameHandler_0_9(AmqpTcpEndpoint endpoint,
-                                      ConnectionFactory.ObtainSocket socketFactory,
-                                      int timeout)
+        public SocketFrameHandler(AmqpTcpEndpoint endpoint,
+                                  ConnectionFactory.ObtainSocket socketFactory,
+                                  int timeout)
         {
             m_endpoint = endpoint;
             m_socket = null;
@@ -157,19 +157,19 @@ public void SendHeader()
             {
                 m_writer.Write(Encoding.ASCII.GetBytes("AMQP"));
                 if (m_endpoint.Protocol.Revision != 0)
-                    {
-                        m_writer.Write((byte)0);
-                        m_writer.Write((byte)m_endpoint.Protocol.MajorVersion);
-                        m_writer.Write((byte)m_endpoint.Protocol.MinorVersion);
-                        m_writer.Write((byte)m_endpoint.Protocol.Revision);
-                    }
+                {
+                    m_writer.Write((byte)0);
+                    m_writer.Write((byte)m_endpoint.Protocol.MajorVersion);
+                    m_writer.Write((byte)m_endpoint.Protocol.MinorVersion);
+                    m_writer.Write((byte)m_endpoint.Protocol.Revision);
+                }
                 else
-                    {
-                        m_writer.Write((byte)1);
-                        m_writer.Write((byte)1);
-                        m_writer.Write((byte)m_endpoint.Protocol.MajorVersion);
-                        m_writer.Write((byte)m_endpoint.Protocol.MinorVersion);
-                    }
+                {
+                    m_writer.Write((byte)1);
+                    m_writer.Write((byte)1);
+                    m_writer.Write((byte)m_endpoint.Protocol.MajorVersion);
+                    m_writer.Write((byte)m_endpoint.Protocol.MinorVersion);
+                }
                 m_writer.Flush();
             }
         }

projects/client/RabbitMQ.Client/src/client/impl/v0_9_1/ProtocolBase.cs

@@ -58,7 +58,7 @@ public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint,
                                                          ConnectionFactory.ObtainSocket socketFactory,
                                                          int timeout)
         {
-            return new SocketFrameHandler_0_9(endpoint, socketFactory, timeout);
+            return new SocketFrameHandler(endpoint, socketFactory, timeout);
         }
 
         public override IModel CreateModel(ISession session) {