summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/websocket
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-02-23 18:38:07 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-02-23 18:38:07 +0000
commit3f605ec90f464d82213bdbaec9341c847b188326 (patch)
tree50316209cee2057e23e12ba781774b57dcdd66e1 /qpid/java/broker-plugins/websocket
parent5f16207bf77afd5caed1ba9329da7a32f1b0c718 (diff)
downloadqpid-python-3f605ec90f464d82213bdbaec9341c847b188326.tar.gz
QPID-5579 : [Java Broker] build attribute meta data the same way for REST API and AMQP Management
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1571054 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/websocket')
-rw-r--r--qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java4
1 files changed, 2 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 81dcb05a41..83e7cff3bd 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
@@ -58,7 +58,7 @@ class WebSocketProvider implements AcceptingTransport
public static final String AMQP_WEBSOCKET_SUBPROTOCOL = "AMQPWSB10";
private final Transport _transport;
private final SSLContext _sslContext;
- private final Port _port;
+ private final Port<?> _port;
private final Set<AmqpProtocolVersion> _supported;
private final AmqpProtocolVersion _defaultSupportedProtocolReply;
private final ProtocolEngineFactory _factory;
@@ -66,7 +66,7 @@ class WebSocketProvider implements AcceptingTransport
WebSocketProvider(final Transport transport,
final SSLContext sslContext,
- final Port port,
+ final Port<?> port,
final Set<AmqpProtocolVersion> supported,
final AmqpProtocolVersion defaultSupportedProtocolReply)
{