QPID-6034: [Java Broker] Refactor Port UI to use metadata service rather than hard-coding a list of protocols/transports etc

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

1 files changed, 15 insertions, 2 deletions

diff --git a/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java b/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
index 2b23efc95b..d989a73fa2 100644
--- a/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
+++ b/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
@@ -32,6 +32,8 @@ import java.util.Set;
 import javax.net.ssl.SSLContext;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.qpid.server.model.port.AmqpPort;
+import org.apache.qpid.server.model.port.HttpPort;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
@@ -108,11 +110,22 @@ class WebSocketProvider implements AcceptingTransport
         {
             throw new IllegalArgumentException("Unexpected transport on port " + _port.getName() + ":" + _transport);
         }
-        String bindingAddress = _port.getBindingAddress();
-        if(bindingAddress != null && !bindingAddress.trim().equals("") && !bindingAddress.trim().equals("*"))
+
+        String bindingAddress = null;
+        if (_port instanceof HttpPort)
+        {
+            bindingAddress = ((HttpPort)_port).getBindingAddress();
+        }
+        else if (_port instanceof AmqpPort)
+        {
+            bindingAddress = ((AmqpPort)_port).getBindingAddress();
+        }
+
+        if (bindingAddress != null && !bindingAddress.trim().equals("") && !bindingAddress.trim().equals("*"))
         {
             connector.setHost(bindingAddress.trim());
         }
+
         connector.setPort(_port.getPort());
         _server.addConnector(connector);