From 52c957574aa3cbdc8a46d81af17c2201841f3632 Mon Sep 17 00:00:00 2001 From: DarkwinX Date: Mon, 11 Aug 2014 17:27:59 +1000 Subject: [PATCH 1/2] Update WebsocketTransport.java --- src/io/socket/WebsocketTransport.java | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/io/socket/WebsocketTransport.java b/src/io/socket/WebsocketTransport.java index 0ec9bee..01fb0d2 100644 --- a/src/io/socket/WebsocketTransport.java +++ b/src/io/socket/WebsocketTransport.java @@ -25,15 +25,26 @@ public static IOTransport create(URL url, IOConnection connection) { return new WebsocketTransport(uri, connection); } - public WebsocketTransport(URI uri, IOConnection connection) { + public WebsocketTransport(URI uri, IOConnection connection) { super(uri); this.connection = connection; - SSLContext context = IOConnection.getSslContext(); + SSLContext context = null; + try { + context = SSLContext.getInstance("TLS", "HarmonyJSSE"); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } catch (NoSuchProviderException e) { + e.printStackTrace(); + } + try { + context.init(null, null, null); + } catch (KeyManagementException e) { + e.printStackTrace(); + } if("wss".equals(uri.getScheme()) && context != null) { - this.setWebSocketFactory(new DefaultSSLWebSocketClientFactory(context)); + this.setWebSocketFactory(new DefaultSSLWebSocketClientFactory(context)); } } - /* (non-Javadoc) * @see io.socket.IOTransport#disconnect() */ @@ -98,4 +109,4 @@ public void onError(Exception ex) { // TODO Auto-generated method stub } -} \ No newline at end of file +} From 878e1fba12691c08a683dcb830999f4ef0b83970 Mon Sep 17 00:00:00 2001 From: DarkwinX Date: Mon, 11 Aug 2014 17:30:58 +1000 Subject: [PATCH 2/2] Revert "Update WebsocketTransport.java" This reverts commit 52c957574aa3cbdc8a46d81af17c2201841f3632. --- src/io/socket/WebsocketTransport.java | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/io/socket/WebsocketTransport.java b/src/io/socket/WebsocketTransport.java index 01fb0d2..0ec9bee 100644 --- a/src/io/socket/WebsocketTransport.java +++ b/src/io/socket/WebsocketTransport.java @@ -25,26 +25,15 @@ public static IOTransport create(URL url, IOConnection connection) { return new WebsocketTransport(uri, connection); } - public WebsocketTransport(URI uri, IOConnection connection) { + public WebsocketTransport(URI uri, IOConnection connection) { super(uri); this.connection = connection; - SSLContext context = null; - try { - context = SSLContext.getInstance("TLS", "HarmonyJSSE"); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } catch (NoSuchProviderException e) { - e.printStackTrace(); - } - try { - context.init(null, null, null); - } catch (KeyManagementException e) { - e.printStackTrace(); - } + SSLContext context = IOConnection.getSslContext(); if("wss".equals(uri.getScheme()) && context != null) { - this.setWebSocketFactory(new DefaultSSLWebSocketClientFactory(context)); + this.setWebSocketFactory(new DefaultSSLWebSocketClientFactory(context)); } } + /* (non-Javadoc) * @see io.socket.IOTransport#disconnect() */ @@ -109,4 +98,4 @@ public void onError(Exception ex) { // TODO Auto-generated method stub } -} +} \ No newline at end of file