summaryrefslogtreecommitdiff
path: root/qpid/java/amqp-1-0-client-websocket
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2015-01-31 12:02:43 +0000
committerRobert Godfrey <rgodfrey@apache.org>2015-01-31 12:02:43 +0000
commit82e0493a76c0ab34bb949e010dfe64f8dc8dba66 (patch)
tree19f9fe4cf0c98293d31ec3f0d2e5c624c4de775f /qpid/java/amqp-1-0-client-websocket
parent5e05fa8c493ac30f80f6998ad928025136b32d5e (diff)
downloadqpid-python-82e0493a76c0ab34bb949e010dfe64f8dc8dba66.tar.gz
QPID-6349 : [JMS AMQP 1.0 Client] Add ability to change the SSL enabled protocols used on the SSLSocket
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1656188 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/amqp-1-0-client-websocket')
-rw-r--r--qpid/java/amqp-1-0-client-websocket/src/main/java/org/apache/qpid/amqp_1_0/client/websocket/WebSocketProvider.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/java/amqp-1-0-client-websocket/src/main/java/org/apache/qpid/amqp_1_0/client/websocket/WebSocketProvider.java b/qpid/java/amqp-1-0-client-websocket/src/main/java/org/apache/qpid/amqp_1_0/client/websocket/WebSocketProvider.java
index af871d2bc4..8df20d495c 100644
--- a/qpid/java/amqp-1-0-client-websocket/src/main/java/org/apache/qpid/amqp_1_0/client/websocket/WebSocketProvider.java
+++ b/qpid/java/amqp-1-0-client-websocket/src/main/java/org/apache/qpid/amqp_1_0/client/websocket/WebSocketProvider.java
@@ -33,6 +33,7 @@ import org.eclipse.jetty.websocket.WebSocketClient;
import org.eclipse.jetty.websocket.WebSocketClientFactory;
import org.apache.qpid.amqp_1_0.client.ConnectionException;
+import org.apache.qpid.amqp_1_0.client.SSLOptions;
import org.apache.qpid.amqp_1_0.client.SSLUtil;
import org.apache.qpid.amqp_1_0.client.TransportProvider;
import org.apache.qpid.amqp_1_0.codec.FrameWriter;
@@ -111,7 +112,9 @@ class WebSocketProvider implements TransportProvider
public void connect(final ConnectionEndpoint conn,
final String address,
final int port,
- final SSLContext sslContext, final ExceptionHandler exceptionHandler) throws ConnectionException
+ final SSLContext sslContext,
+ final SSLOptions sslOptions,
+ final ExceptionHandler exceptionHandler) throws ConnectionException
{
try