Merge pull request #228 from gunnarmorling/227

fixes #227 - Propagating "ConnTimeout" parameter to setConnectTimeout()
searchbox-io · Aug 10, 2015 · 7669a14 · 7669a14
2 parents cd792fc + 27d9b4d
commit 7669a14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/jest/src/main/java/io/searchbox/client/JestClientFactory.java b/jest/src/main/java/io/searchbox/client/JestClientFactory.java
@@ -149,7 +149,7 @@ protected HttpRoutePlanner getRoutePlanner() {
     // Extension point
     protected RequestConfig getRequestConfig() {
         return RequestConfig.custom()
-                .setConnectionRequestTimeout(httpClientConfig.getConnTimeout())
+                .setConnectTimeout(httpClientConfig.getConnTimeout())
                 .setSocketTimeout(httpClientConfig.getReadTimeout())
                 .build();
     }

diff --git a/jest/src/test/java/io/searchbox/client/JestClientFactoryTest.java b/jest/src/test/java/io/searchbox/client/JestClientFactoryTest.java
@@ -28,7 +28,7 @@ public void clientCreationWithTimeout() {
         factory.setHttpClientConfig(httpClientConfig);
         final RequestConfig defaultRequestConfig = factory.getRequestConfig();
         assertNotNull(defaultRequestConfig);
-        assertEquals(150, defaultRequestConfig.getConnectionRequestTimeout());
+        assertEquals(150, defaultRequestConfig.getConnectTimeout());
         assertEquals(300, defaultRequestConfig.getSocketTimeout());
     }