From ea4cc071465737101b7c0070b8b8bc90d7923ee5 Mon Sep 17 00:00:00 2001 From: Nic Hines Date: Fri, 10 Sep 2021 07:10:45 +0100 Subject: [PATCH] Change mapping of connectionRequestTimeout to ConnPool leaseTimeout. Original Pull Request: #1925 Closes: #1926 (cherry picked from commit 3b8f0c9d567d4c91ae937e6b87752d81cda4c0a7) (cherry picked from commit 92806d2e1194bc470244deae8271b0e74ca3288b) --- .../data/elasticsearch/client/RestClients.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/RestClients.java b/src/main/java/org/springframework/data/elasticsearch/client/RestClients.java index 63f22ffa0..4f0ec06be 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/RestClients.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/RestClients.java @@ -54,6 +54,7 @@ import org.springframework.util.Assert; * @author Huw Ayling-Miller * @author Henrique Amaral * @author Peter-Josef Meisch + * @author Nic Hines * @since 3.2 */ public final class RestClients { @@ -104,15 +105,14 @@ public final class RestClients { Duration connectTimeout = clientConfiguration.getConnectTimeout(); if (!connectTimeout.isNegative()) { - requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis())); - requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis())); } Duration timeout = clientConfiguration.getSocketTimeout(); if (!timeout.isNegative()) { requestConfigBuilder.setSocketTimeout(Math.toIntExact(timeout.toMillis())); + requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis())); } clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());