summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-01-13 19:55:02 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-01-13 19:55:02 +0000
commit7c4238cc0cd0cc7b5d3bd8a98c46510040136543 (patch)
tree5e357cd2a87e76a54e2e784102ef03a97a61fc17
parent93dbec4289155847feb3f63ea24623d824ac73df (diff)
downloadqpid-python-7c4238cc0cd0cc7b5d3bd8a98c46510040136543.tar.gz
QPID-5459 : [Java Broker] add secure websocket support to the broker, including ssl client auth
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1557831 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java3
1 files changed, 1 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 4a104a830c..fde93a27e3 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
@@ -212,7 +212,6 @@ class WebSocketProvider implements AcceptingTransport
private Principal _principal;
private int _maxWriteIdle;
private int _maxReadIdle;
- private Principal _peerPrincipal;
public ConnectionWrapper(final WebSocket.Connection connection,
final SocketAddress localAddress,
@@ -310,7 +309,7 @@ class WebSocketProvider implements AcceptingTransport
void setPeerPrincipal(final Principal peerPrincipal)
{
- _peerPrincipal = peerPrincipal;
+ _principal = peerPrincipal;
}
}
}