QPID-3408 : Fix the Java Broker code so it both copes with machines where IPv6 is present, but disabled, and does not open a random port to get a wildcard address

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1297049 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 1 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java b/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
index 8d3f7a779a..472beb6bb1 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.transport;
 
+import java.net.InetSocketAddress;
+
 /**
  * This interface provides a means for NetworkDrivers to configure TCP options such as incoming and outgoing
  * buffer sizes and set particular options on the socket. NetworkDrivers should honour the values returned
@@ -43,4 +45,6 @@ public interface NetworkTransportConfiguration
     String getTransport();
 
     Integer getConnectorProcessors();
+
+    InetSocketAddress getAddress();
 }
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
index 387777a80c..42c8334a5d 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
@@ -157,7 +157,7 @@ public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNet
             _factory = factory;
             _sslContext = sslContext;
 
-            InetSocketAddress address = new InetSocketAddress(config.getHost(), config.getPort());
+            InetSocketAddress address = config.getAddress();
 
             if(sslContext == null)
             {