From 92282633e03601f400b1801664f3258e0d9b35ae Mon Sep 17 00:00:00 2001 From: nichines Date: Thu, 9 Sep 2021 21:35:30 +0100 Subject: [PATCH] Change mapping of connectionRequestTimeout to ConnPool leaseTimeout --- .../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 85fa8ecae..61c514b94 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/RestClients.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/RestClients.java @@ -55,6 +55,7 @@ * @author Huw Ayling-Miller * @author Henrique Amaral * @author Peter-Josef Meisch + * @author Nic Hines * @since 3.2 */ public final class RestClients { @@ -105,15 +106,14 @@ public static ElasticsearchRestClient create(ClientConfiguration clientConfigura 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());