Revert "Handle the case where a dns lookup returns an address for an addressf…"

Author: kjnilsson

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

@@ -1,13 +1,16 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Net;
+using System.Text;
 using System.Threading.Tasks;
-
 namespace RabbitMQ.Client
 {
+
+
     /// <summary>
-    /// Simple wrapper around TcpClient.
+    /// Simple wrapper around TcpClient. 
     /// </summary>
     public class TcpClientAdapter : ITcpClient
     {
@@ -17,18 +20,14 @@ public TcpClientAdapter(Socket socket)
         {
             if (socket == null)
                 throw new InvalidOperationException("socket must not be null");
-
+        
             this.sock = socket;
         }
 
         public virtual async Task ConnectAsync(string host, int port)
         {
             var adds = await Dns.GetHostAddressesAsync(host).ConfigureAwait(false);
-            var ep = adds.FirstOrDefault(a => a.AddressFamily == sock.AddressFamily);
-            if(ep == default(IPAddress))
-            {
-                throw new ArgumentException("No ip address could be resolved for " + host);
-            }
+            var ep = adds.First();
             #if CORECLR
             await sock.ConnectAsync(ep, port);
             #else
@@ -72,4 +71,4 @@ public virtual int ReceiveTimeout
             }
         }
     }
-}
+}

projects/client/Unit/src/unit/TestConnectionFactory.cs

@@ -39,7 +39,6 @@
 //---------------------------------------------------------------------------
 
 using System;
-using System.Collections.Generic;
 using NUnit.Framework;
 using RabbitMQ.Client.Exceptions;
 
@@ -108,7 +107,7 @@ public void TestCreateConnectionWithClientProvidedNameUsesName()
                 Assert.AreEqual("some_name", conn.ClientProperties["connection_name"]);
             }
         }
-
+        
         [Test]
         public void TestCreateConnectionWithClientProvidedNameAndAutorecoveryUsesName()
         {
@@ -187,14 +186,5 @@ public void TestCreateConnectionUsesInvalidAmqpTcpEndpoint()
                         using(var conn = cf.CreateConnection(new System.Collections.Generic.List<AmqpTcpEndpoint> { ep })) {}
                     }, Throws.TypeOf<BrokerUnreachableException>());
         }
-
-        [Test]
-        public void TestCreateConnectioUsesValidEndpointWhenMultipleSupplied()
-        {
-            var cf = new ConnectionFactory();
-            var invalidEp = new AmqpTcpEndpoint("not_localhost");
-            var ep = new AmqpTcpEndpoint("localhost");
-            using(var conn = cf.CreateConnection(new List<AmqpTcpEndpoint> { invalidEp, ep })) {};
-        }
     }
 }