Skip to content

Commit 3b8f0c9

Browse files
authored
Change mapping of connectionRequestTimeout to ConnPool leaseTimeout.
Original Pull Request: #1925 Closes: #1926
1 parent 64624ae commit 3b8f0c9

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
@@ -55,6 +55,7 @@
5555
* @author Huw Ayling-Miller
5656
* @author Henrique Amaral
5757
* @author Peter-Josef Meisch
58+
* @author Nic Hines
5859
* @since 3.2
5960
*/
6061
public final class RestClients {
@@ -105,15 +106,14 @@ public static ElasticsearchRestClient create(ClientConfiguration clientConfigura
105106
Duration connectTimeout = clientConfiguration.getConnectTimeout();
106107

107108
if (!connectTimeout.isNegative()) {
108-
109109
requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis()));
110-
requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis()));
111110
}
112111

113112
Duration timeout = clientConfiguration.getSocketTimeout();
114113

115114
if (!timeout.isNegative()) {
116115
requestConfigBuilder.setSocketTimeout(Math.toIntExact(timeout.toMillis()));
116+
requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis()));
117117
}
118118

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

0 commit comments

Comments
 (0)