Actually, don't have the SocketFrameHandler know the hostname, just return the IP address.

Author: Simon MacMullen

src/com/rabbitmq/client/Connection.java

@@ -17,6 +17,7 @@
 package com.rabbitmq.client;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.Map;
 
 /**
@@ -46,7 +47,7 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
      * Retrieve the host.
      * @return the hostname of the peer we're connected to.
      */
-    String getHost();
+    InetAddress getAddress();
 
     /**
      * Retrieve the port number.

src/com/rabbitmq/client/ConnectionFactory.java

@@ -360,13 +360,13 @@ protected FrameHandler createFrameHandler(Address addr)
         Socket socket = factory.createSocket();
         configureSocket(socket);
         socket.connect(new InetSocketAddress(hostName, portNumber), connectionTimeout);
-        return createFrameHandler(socket, hostName);
+        return createFrameHandler(socket);
     }
 
-    protected FrameHandler createFrameHandler(Socket sock, String host)
+    protected FrameHandler createFrameHandler(Socket sock)
         throws IOException
     {
-        return new SocketFrameHandler(sock, host);
+        return new SocketFrameHandler(sock);
     }
 
     /**

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -19,6 +19,7 @@
 
 import java.io.EOFException;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.SocketException;
 import java.util.HashMap;
 import java.util.Map;
@@ -151,8 +152,8 @@ public void ensureIsOpen()
     public Map<String, Object> _serverProperties;
 
     /** {@inheritDoc} */
-    public String getHost() {
-        return _frameHandler.getHost();
+    public InetAddress getAddress() {
+        return _frameHandler.getAddress();
     }
 
     /** {@inheritDoc} */
@@ -241,7 +242,7 @@ public void start()
 
         // start the main loop going
         Thread ml = new MainLoop();
-        ml.setName("AMQP Connection " + getHost() + ":" + getPort());
+        ml.setName("AMQP Connection " + getAddress().getHostAddress() + ":" + getPort());
         ml.start();
 
         AMQP.Connection.Start connStart = null;
@@ -559,7 +560,7 @@ public void handleConnectionClose(Command closeCommand) {
         _brokerInitiatedShutdown = true;
         Thread scw = new SocketCloseWait(sse);
         scw.setName("AMQP Connection Closing Monitor " +
-                    getHost() + ":" + getPort());
+                    getAddress().getHostAddress() + ":" + getPort());
         scw.start();
     }
 
@@ -726,6 +727,6 @@ public void close(int closeCode,
     }
 
     @Override public String toString() {
-        return "amqp://" + _factory.getUsername() + "@" + getHost() + ":" + getPort() + _virtualHost;
+        return "amqp://" + _factory.getUsername() + "@" + getAddress().getHostAddress() + ":" + getPort() + _virtualHost;
     }
 }

src/com/rabbitmq/client/impl/FrameHandler.java

@@ -17,6 +17,7 @@
 package com.rabbitmq.client.impl;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 
@@ -25,8 +26,8 @@
  */
 
 public interface FrameHandler {
-    /** Retrieve hostname of peer. */
-    public String getHost();
+    /** Retrieve address of peer. */
+    public InetAddress getAddress();
 
     /** Retrieve port number of peer. */
     public int getPort();

src/com/rabbitmq/client/impl/SocketFrameHandler.java

@@ -21,6 +21,7 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
 
@@ -33,9 +34,6 @@
  */
 
 public class SocketFrameHandler implements FrameHandler {
-    /** Host we connect to */
-    public final String _host;
-
     /** The underlying socket */
     public final Socket _socket;
 
@@ -51,16 +49,15 @@ public class SocketFrameHandler implements FrameHandler {
     /**
      * @param socket the socket to use
      */
-    public SocketFrameHandler(Socket socket, String host) throws IOException {
+    public SocketFrameHandler(Socket socket) throws IOException {
         _socket = socket;
-        _host = host;
 
         _inputStream = new DataInputStream(new BufferedInputStream(_socket.getInputStream()));
         _outputStream = new DataOutputStream(new BufferedOutputStream(_socket.getOutputStream()));
     }
 
-    public String getHost() {
-        return _host;
+    public InetAddress getAddress() {
+        return _socket.getInetAddress();
     }
 
     public int getPort() {

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

@@ -17,6 +17,7 @@
 package com.rabbitmq.client.test;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
@@ -159,8 +160,8 @@ public int getTimeout() throws SocketException {
             return 0;
         }
 
-        public String getHost() {
-            return "MockFrameHandler";
+        public InetAddress getAddress() {
+            return null;
         }
 
         public int getPort() {

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

@@ -18,6 +18,7 @@
 package com.rabbitmq.client.test;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -145,8 +146,8 @@ public int getTimeout() throws SocketException {
             return 0;
         }
 
-        public String getHost() {
-            return "MyFrameHandler";
+        public InetAddress getAddress() {
+            return null;
         }
 
         public int getPort() {

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

@@ -36,7 +36,7 @@ public boolean hadValidShutdown(){
     public SpecialConnection() throws Exception{
       super(
           new ConnectionFactory(),
-          new SocketFrameHandler(SocketFactory.getDefault().createSocket("localhost", 5672), "localhost"),
+          new SocketFrameHandler(SocketFactory.getDefault().createSocket("localhost", 5672)),
           new DefaultExceptionHandler(){
             @Override public void handleConsumerException(Channel channel,
                                                            Throwable exception,

test/src/com/rabbitmq/client/test/functional/ConnectionOpen.java

@@ -36,7 +36,7 @@
 public class ConnectionOpen extends TestCase {
     public void testCorrectProtocolHeader() throws IOException {
         ConnectionFactory factory = new ConnectionFactory();
-        SocketFrameHandler fh = new SocketFrameHandler(factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT), "localhost");
+        SocketFrameHandler fh = new SocketFrameHandler(factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT));
         fh.sendHeader();
         AMQCommand.Assembler a = AMQCommand.newAssembler();
         AMQCommand command = null;
@@ -56,7 +56,7 @@ public void testCorrectProtocolHeader() throws IOException {
 
     public void testCrazyProtocolHeader() throws IOException {
         ConnectionFactory factory = new ConnectionFactory();
-        SocketFrameHandler fh = new SocketFrameHandler(factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT), "localhost");
+        SocketFrameHandler fh = new SocketFrameHandler(factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT));
         fh.sendHeader(100, 3); // major, minor
         DataInputStream in = fh._inputStream;
         // we should get a valid protocol header back

test/src/com/rabbitmq/client/test/functional/FrameMax.java

@@ -83,7 +83,7 @@ private static class MyFrameHandler extends SocketFrameHandler {
         public MyFrameHandler(Socket socket)
             throws IOException
         {
-            super(socket, "localhost");
+            super(socket);
         }
 
         public Frame readFrame() throws IOException {