Skip to content

Commit 2f7ac69

Browse files
committed
[java] Setting a connection timeout for the WS connection
Fixes #13884
1 parent 9c8133a commit 2f7ac69

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,14 @@ public class JdkHttpClient implements HttpClient {
7777
private final List<WebSocket> websockets;
7878
private final ExecutorService executorService;
7979
private final Duration readTimeout;
80+
private final Duration connectTimeout;
8081

8182
JdkHttpClient(ClientConfig config) {
8283
Objects.requireNonNull(config, "Client config must be set");
8384

8485
this.messages = new JdkHttpMessages(config);
8586
this.readTimeout = config.readTimeout();
87+
this.connectTimeout = config.connectionTimeout();
8688
this.websockets = new ArrayList<>();
8789
this.handler = config.filter().andFinally(this::execute0);
8890

@@ -98,7 +100,7 @@ public class JdkHttpClient implements HttpClient {
98100

99101
java.net.http.HttpClient.Builder builder =
100102
java.net.http.HttpClient.newBuilder()
101-
.connectTimeout(config.connectionTimeout())
103+
.connectTimeout(connectTimeout)
102104
.followRedirects(java.net.http.HttpClient.Redirect.NEVER)
103105
.executor(executorService);
104106

@@ -165,6 +167,7 @@ public WebSocket openSocket(HttpRequest request, WebSocket.Listener listener) {
165167
CompletableFuture<java.net.http.WebSocket> webSocketCompletableFuture =
166168
client
167169
.newWebSocketBuilder()
170+
.connectTimeout(connectTimeout)
168171
.buildAsync(
169172
uri,
170173
new java.net.http.WebSocket.Listener() {

0 commit comments

Comments
 (0)