Merge branch 'stable'

Author: acogoluegnes

src/main/java/com/rabbitmq/client/DnsRecordIpAddressResolver.java

@@ -66,15 +66,12 @@ public DnsRecordIpAddressResolver(Address address, boolean ssl) {
      * @throws IOException if DNS resolution fails
      */
     @Override
-    public List<Address> getAddresses() throws IOException {
+    public List<Address> getAddresses() throws UnknownHostException {
         String hostName = address.getHost();
         int portNumber = ConnectionFactory.portOrDefault(address.getPort(), ssl);
-        InetAddress[] inetAddresses;
-        try {
-            inetAddresses = resolveIpAddresses(hostName);
-        } catch (UnknownHostException e) {
-            throw new IOException("Could not resolve IP addresses for host "+hostName, e);
-        }
+
+        InetAddress[] inetAddresses = resolveIpAddresses(hostName);
+
         List<Address> addresses = new ArrayList<Address>();
         for (InetAddress inetAddress : inetAddresses) {
             addresses.add(new Address(inetAddress.getHostAddress(), portNumber));

src/test/java/com/rabbitmq/client/test/DnsRecordIpAddressResolverTests.java

@@ -1,15 +1,15 @@
 package com.rabbitmq.client.test;
 
-import static org.junit.Assert.fail;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.DnsRecordIpAddressResolver;
+import org.junit.Test;
 
 import java.io.IOException;
+import java.net.UnknownHostException;
 import java.util.concurrent.TimeoutException;
 
-import org.junit.Test;
-
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-import com.rabbitmq.client.DnsRecordIpAddressResolver;
+import static org.junit.Assert.fail;
 
 /**
  *
@@ -45,7 +45,7 @@ public class DnsRecordIpAddressResolverTests extends BrokerTestCase {
         try {
             connectionFactory.newConnection(addressResolver);
             fail("The host resolution should have failed");
-        } catch (IOException e) {
+        } catch (UnknownHostException e) {
             // expected
         }
     }