Skip to content

Commit de7b8b2

Browse files
authored
Merge pull request TooTallNate#1387 from pavel-treutner/issue-1382
Retrieve default SSL socket factory
2 parents 9dce7a8 + d4365d4 commit de7b8b2

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/main/java/org/java_websocket/client/WebSocketClient.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import java.util.concurrent.CountDownLatch;
4646
import java.util.concurrent.TimeUnit;
4747
import javax.net.SocketFactory;
48-
import javax.net.ssl.SSLContext;
4948
import javax.net.ssl.SSLException;
5049
import javax.net.ssl.SSLParameters;
5150
import javax.net.ssl.SSLSession;
@@ -543,9 +542,7 @@ private void upgradeSocketToSSL()
543542
if (socketFactory instanceof SSLSocketFactory) {
544543
factory = (SSLSocketFactory) socketFactory;
545544
} else {
546-
SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
547-
sslContext.init(null, null, null);
548-
factory = sslContext.getSocketFactory();
545+
factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
549546
}
550547
socket = factory.createSocket(socket, uri.getHost(), getPort(), true);
551548
}

0 commit comments

Comments
 (0)