Extract a method, remove dead code

Author: michaelklishin

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

@@ -85,7 +85,7 @@ public SocketFrameHandler(AmqpTcpEndpoint endpoint,
         {
             Endpoint = endpoint;
 
-            if (Socket.OSSupportsIPv6 && endpoint.AddressFamily != AddressFamily.InterNetwork)
+            if (ShouldTryIPV6(endpoint))
             {
                 try {
                     m_socket = ConnectUsingIPv6(endpoint, socketFactory, connectionTimeout);
@@ -155,12 +155,10 @@ public int ReadTimeout
                         m_socket.ReceiveTimeout = value;
                     }
                 }
-#pragma warning disable 0168
-                catch (SocketException _)
+                catch (SocketException)
                 {
                     // means that the socket is already closed
                 }
-#pragma warning restore 0168
             }
         }
 
@@ -181,13 +179,6 @@ public void Close()
                 {
                     try
                     {
-                        try
-                        {
-
-                        } catch (ArgumentException)
-                        {
-                            // ignore, we are closing anyway
-                        };
                         m_socket.Close();
                     }
                     catch (Exception)
@@ -264,6 +255,11 @@ public void Flush()
             }
         }
 
+        private bool ShouldTryIPV6(AmqpTcpEndpoint endpoint)
+        {
+            return (Socket.OSSupportsIPv6 && endpoint.AddressFamily != AddressFamily.InterNetwork)
+        }
+
         private ITcpClient ConnectUsingIPv6(AmqpTcpEndpoint endpoint,
                                             Func<AddressFamily, ITcpClient> socketFactory,
                                             int timeout)