Skip to content

Commit 92806d2

Browse files
nichinessothawo
authored andcommitted
Change mapping of connectionRequestTimeout to ConnPool leaseTimeout.
Original Pull Request: #1925 Closes: #1926 (cherry picked from commit 3b8f0c9)
1 parent 2dd0a67 commit 92806d2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: src/main/java/org/springframework/data/elasticsearch/client/RestClients.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
* @author Huw Ayling-Miller
5555
* @author Henrique Amaral
5656
* @author Peter-Josef Meisch
57+
* @author Nic Hines
5758
* @since 3.2
5859
*/
5960
public final class RestClients {
@@ -104,15 +105,14 @@ public static ElasticsearchRestClient create(ClientConfiguration clientConfigura
104105
Duration connectTimeout = clientConfiguration.getConnectTimeout();
105106

106107
if (!connectTimeout.isNegative()) {
107-
108108
requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis()));
109-
requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis()));
110109
}
111110

112111
Duration timeout = clientConfiguration.getSocketTimeout();
113112

114113
if (!timeout.isNegative()) {
115114
requestConfigBuilder.setSocketTimeout(Math.toIntExact(timeout.toMillis()));
115+
requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis()));
116116
}
117117

118118
clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());

0 commit comments

Comments
 (0)