Skip to content
This repository was archived by the owner on Mar 6, 2018. It is now read-only.

Fix ssl #124

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/io/socket/WebsocketTransport.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
import java.io.IOException;
import java.net.URI;
import java.net.URL;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.regex.Pattern;

import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;

import org.java_websocket.client.DefaultSSLWebSocketClientFactory;
import org.java_websocket.client.WebSocketClient;
Expand All @@ -16,6 +17,7 @@ class WebsocketTransport extends WebSocketClient implements IOTransport {
private final static Pattern PATTERN_HTTP = Pattern.compile("^http");
public static final String TRANSPORT_NAME = "websocket";
private IOConnection connection;
private ExecutorService exec;
public static IOTransport create(URL url, IOConnection connection) {
URI uri = URI.create(
PATTERN_HTTP.matcher(url.toString()).replaceFirst("ws")
Expand All @@ -30,7 +32,8 @@ public WebsocketTransport(URI uri, IOConnection connection) {
this.connection = connection;
SSLContext context = IOConnection.getSslContext();
if("wss".equals(uri.getScheme()) && context != null) {
this.setWebSocketFactory(new DefaultSSLWebSocketClientFactory(context));
exec = Executors.newSingleThreadScheduledExecutor();
this.setWebSocketFactory(new DefaultSSLWebSocketClientFactory(context, exec));
}
}

Expand All @@ -39,6 +42,10 @@ public WebsocketTransport(URI uri, IOConnection connection) {
*/
@Override
public void disconnect() {
if (exec != null) {
exec.shutdownNow();
exec = null;
}
try {
this.close();
} catch (Exception e) {
Expand Down Expand Up @@ -96,6 +103,5 @@ public String getName() {
@Override
public void onError(Exception ex) {
// TODO Auto-generated method stub

}
}