Changed requestTimeout's type to java.time.Duration (#1864)

Asapin · web-flow · commit 0ebfd642b4b1 · 2023-04-23T12:48:49.000+05:30
diff --git a/client/src/main/java/org/asynchttpclient/AsyncHttpClient.java b/client/src/main/java/org/asynchttpclient/AsyncHttpClient.java
@@ -120,7 +120,7 @@
  * Finally, you can configure the AsyncHttpClient using an {@link DefaultAsyncHttpClientConfig} instance.
  * <br>
  * <blockquote><pre>
- *      AsyncHttpClient c = new AsyncHttpClient(new AsyncHttpClientConfig.Builder().setRequestTimeoutInMs(...).build());
+ *      AsyncHttpClient c = new AsyncHttpClient(new DefaultAsyncHttpClientConfig.Builder().setRequestTimeout(...).build());
  *      Future&lt;Response&gt; f = c.prepareGet(TARGET_URL).execute();
  *      Response r = f.get();
  * </pre></blockquote>
diff --git a/client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java b/client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java
@@ -105,11 +105,11 @@ public interface AsyncHttpClientConfig {
     int getConnectionPoolCleanerPeriod();
 
     /**
-     * Return the maximum time in millisecond an {@link AsyncHttpClient} waits until the response is completed.
+     * Return the maximum time an {@link AsyncHttpClient} waits until the response is completed.
      *
-     * @return the maximum time in millisecond an {@link AsyncHttpClient} waits until the response is completed.
+     * @return the maximum time an {@link AsyncHttpClient} waits until the response is completed.
      */
-    int getRequestTimeout();
+    Duration getRequestTimeout();
 
     /**
      * Is HTTP redirect enabled
diff --git a/client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClientConfig.java b/client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClientConfig.java
@@ -132,7 +132,7 @@ public class DefaultAsyncHttpClientConfig implements AsyncHttpClientConfig {
 
     // timeouts
     private final Duration connectTimeout;
-    private final int requestTimeout;
+    private final Duration requestTimeout;
     private final int readTimeout;
     private final int shutdownQuietPeriod;
     private final int shutdownTimeout;
@@ -217,7 +217,7 @@ private DefaultAsyncHttpClientConfig(// http
 
                                          // timeouts
                                          Duration connectTimeout,
-                                         int requestTimeout,
+                                         Duration requestTimeout,
                                          int readTimeout,
                                          int shutdownQuietPeriod,
                                          int shutdownTimeout,
@@ -478,7 +478,7 @@ public Duration getConnectTimeout() {
     }
 
     @Override
-    public int getRequestTimeout() {
+    public Duration getRequestTimeout() {
         return requestTimeout;
     }
 
@@ -797,7 +797,7 @@ public static class Builder {
 
         // timeouts
         private Duration connectTimeout = defaultConnectTimeout();
-        private int requestTimeout = defaultRequestTimeout();
+        private Duration requestTimeout = defaultRequestTimeout();
         private int readTimeout = defaultReadTimeout();
         private int shutdownQuietPeriod = defaultShutdownQuietPeriod();
         private int shutdownTimeout = defaultShutdownTimeout();
@@ -1064,7 +1064,7 @@ public Builder setConnectTimeout(Duration connectTimeout) {
             return this;
         }
 
-        public Builder setRequestTimeout(int requestTimeout) {
+        public Builder setRequestTimeout(Duration requestTimeout) {
             this.requestTimeout = requestTimeout;
             return this;
         }
diff --git a/client/src/main/java/org/asynchttpclient/DefaultRequest.java b/client/src/main/java/org/asynchttpclient/DefaultRequest.java
@@ -29,6 +29,7 @@
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -57,7 +58,7 @@ public class DefaultRequest implements Request {
     private final Realm realm;
     private final File file;
     private final Boolean followRedirect;
-    private final int requestTimeout;
+    private final Duration requestTimeout;
     private final int readTimeout;
     private final long rangeOffset;
     private final Charset charset;
@@ -86,7 +87,7 @@ public DefaultRequest(String method,
                           Realm realm,
                           File file,
                           Boolean followRedirect,
-                          int requestTimeout,
+                          Duration requestTimeout,
                           int readTimeout,
                           long rangeOffset,
                           Charset charset,
@@ -111,7 +112,7 @@ public DefaultRequest(String method,
         this.realm = realm;
         this.file = file;
         this.followRedirect = followRedirect;
-        this.requestTimeout = requestTimeout;
+        this.requestTimeout = requestTimeout == null ? Duration.ZERO : requestTimeout;
         this.readTimeout = readTimeout;
         this.rangeOffset = rangeOffset;
         this.charset = charset;
@@ -220,7 +221,7 @@ public Boolean getFollowRedirect() {
     }
 
     @Override
-    public int getRequestTimeout() {
+    public Duration getRequestTimeout() {
         return requestTimeout;
     }
 
diff --git a/client/src/main/java/org/asynchttpclient/Request.java b/client/src/main/java/org/asynchttpclient/Request.java
@@ -30,6 +30,7 @@
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.time.Duration;
 import java.util.List;
 
 /**
@@ -154,7 +155,7 @@ public interface Request {
     /**
      * @return the request timeout. Non zero values means "override config value".
      */
-    int getRequestTimeout();
+    Duration getRequestTimeout();
 
     /**
      * @return the read timeout. Non zero values means "override config value".
diff --git a/client/src/main/java/org/asynchttpclient/RequestBuilderBase.java b/client/src/main/java/org/asynchttpclient/RequestBuilderBase.java
@@ -35,6 +35,7 @@
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -82,7 +83,7 @@ public abstract class RequestBuilderBase<T extends RequestBuilderBase<T>> {
     protected Realm realm;
     protected File file;
     protected Boolean followRedirect;
-    protected int requestTimeout;
+    protected Duration requestTimeout;
     protected int readTimeout;
     protected long rangeOffset;
     protected Charset charset;
@@ -503,7 +504,7 @@ public T setFollowRedirect(boolean followRedirect) {
         return asDerivedType();
     }
 
-    public T setRequestTimeout(int requestTimeout) {
+    public T setRequestTimeout(Duration requestTimeout) {
         this.requestTimeout = requestTimeout;
         return asDerivedType();
     }
diff --git a/client/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigDefaults.java b/client/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigDefaults.java
@@ -127,8 +127,8 @@ public static int defaultReadTimeout() {
         return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + READ_TIMEOUT_CONFIG);
     }
 
-    public static int defaultRequestTimeout() {
-        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + REQUEST_TIMEOUT_CONFIG);
+    public static Duration defaultRequestTimeout() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getDuration(ASYNC_CLIENT_CONFIG_ROOT + REQUEST_TIMEOUT_CONFIG);
     }
 
     public static int defaultConnectionTtl() {
diff --git a/client/src/main/java/org/asynchttpclient/netty/timeout/RequestTimeoutTimerTask.java b/client/src/main/java/org/asynchttpclient/netty/timeout/RequestTimeoutTimerTask.java
@@ -29,7 +29,7 @@ public class RequestTimeoutTimerTask extends TimeoutTimerTask {
     RequestTimeoutTimerTask(NettyResponseFuture<?> nettyResponseFuture,
                             NettyRequestSender requestSender,
                             TimeoutsHolder timeoutsHolder,
-                            int requestTimeout) {
+                            long requestTimeout) {
         super(nettyResponseFuture, requestSender, timeoutsHolder);
         this.requestTimeout = requestTimeout;
     }
diff --git a/client/src/main/java/org/asynchttpclient/netty/timeout/TimeoutsHolder.java b/client/src/main/java/org/asynchttpclient/netty/timeout/TimeoutsHolder.java
@@ -53,12 +53,12 @@ public TimeoutsHolder(Timer nettyTimer, NettyResponseFuture<?> nettyResponseFutu
         final int readTimeoutInMs = targetRequest.getReadTimeout();
         readTimeoutValue = readTimeoutInMs == 0 ? config.getReadTimeout() : readTimeoutInMs;
 
-        int requestTimeoutInMs = targetRequest.getRequestTimeout();
+        long requestTimeoutInMs = targetRequest.getRequestTimeout().toMillis();
         if (requestTimeoutInMs == 0) {
-            requestTimeoutInMs = config.getRequestTimeout();
+            requestTimeoutInMs = config.getRequestTimeout().toMillis();
         }
 
-        if (requestTimeoutInMs != -1) {
+        if (requestTimeoutInMs > -1) {
             requestTimeoutMillisTime = unpreciseMillisTime() + requestTimeoutInMs;
             requestTimeout = newTimeout(new RequestTimeoutTimerTask(nettyResponseFuture, requestSender, this, requestTimeoutInMs), requestTimeoutInMs);
         } else {
diff --git a/client/src/main/resources/org/asynchttpclient/config/ahc-default.properties b/client/src/main/resources/org/asynchttpclient/config/ahc-default.properties
@@ -6,7 +6,7 @@ org.asynchttpclient.connectTimeout=PT5S
 org.asynchttpclient.pooledConnectionIdleTimeout=60000
 org.asynchttpclient.connectionPoolCleanerPeriod=100
 org.asynchttpclient.readTimeout=60000
-org.asynchttpclient.requestTimeout=60000
+org.asynchttpclient.requestTimeout=PT1M
 org.asynchttpclient.connectionTtl=-1
 org.asynchttpclient.followRedirect=false
 org.asynchttpclient.maxRedirects=5
diff --git a/client/src/test/java/org/asynchttpclient/AsyncHttpClientDefaultsTest.java b/client/src/test/java/org/asynchttpclient/AsyncHttpClientDefaultsTest.java
@@ -68,8 +68,8 @@ public void testDefaultReadTimeout() {
 
     @RepeatedIfExceptionsTest(repeats = 5)
     public void testDefaultRequestTimeout() {
-        assertEquals(AsyncHttpClientConfigDefaults.defaultRequestTimeout(), 60 * 1000);
-        testIntegerSystemProperty("requestTimeout", "defaultRequestTimeout", "100");
+        assertEquals(AsyncHttpClientConfigDefaults.defaultRequestTimeout(), Duration.ofSeconds(60));
+        testDurationSystemProperty("requestTimeout", "defaultRequestTimeout", "PT0.1S");
     }
 
     @RepeatedIfExceptionsTest(repeats = 5)
diff --git a/client/src/test/java/org/asynchttpclient/AuthTimeoutTest.java b/client/src/test/java/org/asynchttpclient/AuthTimeoutTest.java
@@ -26,6 +26,7 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.time.Duration;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -45,7 +46,7 @@
 
 public class AuthTimeoutTest extends AbstractBasicTest {
 
-    private static final int REQUEST_TIMEOUT = 1000;
+    private static final Duration REQUEST_TIMEOUT = Duration.ofSeconds(1);
     private static final int SHORT_FUTURE_TIMEOUT = 500; // shorter than REQUEST_TIMEOUT
     private static final int LONG_FUTURE_TIMEOUT = 1500; // longer than REQUEST_TIMEOUT
 
diff --git a/client/src/test/java/org/asynchttpclient/BasicHttpTest.java b/client/src/test/java/org/asynchttpclient/BasicHttpTest.java
@@ -43,6 +43,7 @@
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -679,7 +680,7 @@ public void onThrowable(Throwable t) {
     @RepeatedIfExceptionsTest(repeats = 5)
     public void configTimeoutNotifiesOnThrowableAndFuture() throws Throwable {
         assertThrows(TimeoutException.class, () -> {
-            withClient(config().setRequestTimeout(1_000)).run(client ->
+            withClient(config().setRequestTimeout(Duration.ofSeconds(1))).run(client ->
                     withServer(server).run(server -> {
                         HttpHeaders headers = new DefaultHttpHeaders();
                         headers.add("X-Delay", 5_000); // delay greater than timeout
@@ -724,7 +725,7 @@ public void onThrowable(Throwable t) {
     @RepeatedIfExceptionsTest(repeats = 5)
     public void configRequestTimeoutHappensInDueTime() throws Throwable {
         assertThrows(TimeoutException.class, () -> {
-            withClient(config().setRequestTimeout(1_000)).run(client ->
+            withClient(config().setRequestTimeout(Duration.ofSeconds(1))).run(client ->
                     withServer(server).run(server -> {
                         HttpHeaders h = new DefaultHttpHeaders();
                         h.add(CONTENT_TYPE, HttpHeaderValues.APPLICATION_X_WWW_FORM_URLENCODED);
diff --git a/client/src/test/java/org/asynchttpclient/BasicHttpsTest.java b/client/src/test/java/org/asynchttpclient/BasicHttpsTest.java
@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Timeout;
 
 import javax.net.ssl.SSLHandshakeException;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -172,7 +173,7 @@ public void failInstantlyIfNotAllowedSelfSignedCertificate() throws Throwable {
         logger.debug(">>> failInstantlyIfNotAllowedSelfSignedCertificate");
 
         assertThrows(SSLHandshakeException.class, () -> {
-            withClient(config().setMaxRequestRetry(0).setRequestTimeout(2000)).run(client ->
+            withClient(config().setMaxRequestRetry(0).setRequestTimeout(Duration.ofSeconds(2))).run(client ->
                     withServer(server).run(server -> {
                         try {
                             client.prepareGet(getTargetUrl()).execute().get(TIMEOUT, SECONDS);
diff --git a/client/src/test/java/org/asynchttpclient/NoNullResponseTest.java b/client/src/test/java/org/asynchttpclient/NoNullResponseTest.java
@@ -34,7 +34,7 @@ public void multipleSslRequestsWithDelayAndKeepAlive() throws Exception {
                 .setKeepAlive(true)
                 .setConnectTimeout(Duration.ofSeconds(10))
                 .setPooledConnectionIdleTimeout(60000)
-                .setRequestTimeout(10000)
+                .setRequestTimeout(Duration.ofSeconds(10))
                 .setMaxConnectionsPerHost(-1)
                 .setMaxConnections(-1)
                 .build();
diff --git a/client/src/test/java/org/asynchttpclient/PerRequestTimeoutTest.java b/client/src/test/java/org/asynchttpclient/PerRequestTimeoutTest.java
@@ -24,6 +24,7 @@
 import org.eclipse.jetty.server.handler.AbstractHandler;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -64,7 +65,9 @@ public AbstractHandler configureHandler() throws Exception {
     @RepeatedIfExceptionsTest(repeats = 5)
     public void testRequestTimeout() throws IOException {
         try (AsyncHttpClient client = asyncHttpClient()) {
-            Future<Response> responseFuture = client.prepareGet(getTargetUrl()).setRequestTimeout(100).execute();
+            Future<Response> responseFuture = client.prepareGet(getTargetUrl())
+                    .setRequestTimeout(Duration.ofMillis(100))
+                    .execute();
             Response response = responseFuture.get(2000, TimeUnit.MILLISECONDS);
             assertNull(response);
         } catch (InterruptedException e) {
@@ -95,8 +98,10 @@ public void testReadTimeout() throws IOException {
 
     @RepeatedIfExceptionsTest(repeats = 5)
     public void testGlobalDefaultPerRequestInfiniteTimeout() throws IOException {
-        try (AsyncHttpClient client = asyncHttpClient(config().setRequestTimeout(100))) {
-            Future<Response> responseFuture = client.prepareGet(getTargetUrl()).setRequestTimeout(-1).execute();
+        try (AsyncHttpClient client = asyncHttpClient(config().setRequestTimeout(Duration.ofMillis(100)))) {
+            Future<Response> responseFuture = client.prepareGet(getTargetUrl())
+                    .setRequestTimeout(Duration.ofMillis(-1))
+                    .execute();
             Response response = responseFuture.get();
             assertNotNull(response);
         } catch (InterruptedException e) {
@@ -109,7 +114,7 @@ public void testGlobalDefaultPerRequestInfiniteTimeout() throws IOException {
 
     @RepeatedIfExceptionsTest(repeats = 5)
     public void testGlobalRequestTimeout() throws IOException {
-        try (AsyncHttpClient client = asyncHttpClient(config().setRequestTimeout(100))) {
+        try (AsyncHttpClient client = asyncHttpClient(config().setRequestTimeout(Duration.ofMillis(100)))) {
             Future<Response> responseFuture = client.prepareGet(getTargetUrl()).execute();
             Response response = responseFuture.get(2000, TimeUnit.MILLISECONDS);
             assertNull(response);
diff --git a/client/src/test/java/org/asynchttpclient/RedirectConnectionUsageTest.java b/client/src/test/java/org/asynchttpclient/RedirectConnectionUsageTest.java
@@ -76,7 +76,7 @@ public void testGetRedirectFinalUrl() throws Exception {
                 .setMaxConnectionsPerHost(1)
                 .setMaxConnections(1)
                 .setConnectTimeout(Duration.ofSeconds(1))
-                .setRequestTimeout(1000)
+                .setRequestTimeout(Duration.ofSeconds(1))
                 .setFollowRedirect(true)
                 .build();
 
diff --git a/client/src/test/java/org/asynchttpclient/channel/MaxConnectionsInThreadsTest.java b/client/src/test/java/org/asynchttpclient/channel/MaxConnectionsInThreadsTest.java
@@ -69,7 +69,7 @@ public void testMaxConnectionsWithinThreads() throws Exception {
 
         AsyncHttpClientConfig config = config()
                 .setConnectTimeout(Duration.ofSeconds(1))
-                .setRequestTimeout(5000)
+                .setRequestTimeout(Duration.ofSeconds(5))
                 .setKeepAlive(true)
                 .setMaxConnections(1)
                 .setMaxConnectionsPerHost(1)
diff --git a/client/src/test/java/org/asynchttpclient/channel/MaxTotalConnectionTest.java b/client/src/test/java/org/asynchttpclient/channel/MaxTotalConnectionTest.java
@@ -44,7 +44,7 @@ public void testMaxTotalConnectionsExceedingException() throws IOException {
 
         AsyncHttpClientConfig config = config()
                 .setConnectTimeout(Duration.ofSeconds(1))
-                .setRequestTimeout(5000)
+                .setRequestTimeout(Duration.ofSeconds(5))
                 .setKeepAlive(false)
                 .setMaxConnections(1)
                 .setMaxConnectionsPerHost(1)
@@ -84,7 +84,7 @@ public void testMaxTotalConnections() throws Exception {
 
         AsyncHttpClientConfig config = config()
                 .setConnectTimeout(Duration.ofSeconds(1))
-                .setRequestTimeout(5000)
+                .setRequestTimeout(Duration.ofSeconds(5))
                 .setKeepAlive(false)
                 .setMaxConnections(2)
                 .setMaxConnectionsPerHost(1)
diff --git a/client/src/test/java/org/asynchttpclient/handler/BodyDeferringAsyncHandlerTest.java b/client/src/test/java/org/asynchttpclient/handler/BodyDeferringAsyncHandlerTest.java
@@ -33,6 +33,7 @@
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
@@ -61,7 +62,7 @@ public AbstractHandler configureHandler() throws Exception {
 
     private static AsyncHttpClientConfig getAsyncHttpClientConfig() {
         // for this test brevity's sake, we are limiting to 1 retries
-        return config().setMaxRequestRetry(0).setRequestTimeout(10000).build();
+        return config().setMaxRequestRetry(0).setRequestTimeout(Duration.ofSeconds(10)).build();
     }
 
     @RepeatedIfExceptionsTest(repeats = 5)
@@ -179,7 +180,7 @@ public void deferredInputStreamTrickWithFailure() throws Throwable {
 
     @RepeatedIfExceptionsTest(repeats = 5)
     public void deferredInputStreamTrickWithCloseConnectionAndRetry() throws Throwable {
-        try (AsyncHttpClient client = asyncHttpClient(config().setMaxRequestRetry(1).setRequestTimeout(10000).build())) {
+        try (AsyncHttpClient client = asyncHttpClient(config().setMaxRequestRetry(1).setRequestTimeout(Duration.ofSeconds(10)).build())) {
             BoundRequestBuilder r = client.prepareGet(getTargetUrl()).addHeader("X-CLOSE-CONNECTION", Boolean.TRUE.toString());
             PipedOutputStream pos = new PipedOutputStream();
             PipedInputStream pis = new PipedInputStream(pos);
diff --git a/client/src/test/java/org/asynchttpclient/netty/NettyConnectionResetByPeerTest.java b/client/src/test/java/org/asynchttpclient/netty/NettyConnectionResetByPeerTest.java
diff --git a/client/src/test/java/org/asynchttpclient/netty/NettyRequestThrottleTimeoutTest.java b/client/src/test/java/org/asynchttpclient/netty/NettyRequestThrottleTimeoutTest.java
diff --git a/client/src/test/java/org/asynchttpclient/netty/RetryNonBlockingIssueTest.java b/client/src/test/java/org/asynchttpclient/netty/RetryNonBlockingIssueTest.java
diff --git a/client/src/test/java/org/asynchttpclient/request/body/BodyChunkTest.java b/client/src/test/java/org/asynchttpclient/request/body/BodyChunkTest.java
diff --git a/client/src/test/java/org/asynchttpclient/request/body/ChunkingTest.java b/client/src/test/java/org/asynchttpclient/request/body/ChunkingTest.java
diff --git a/client/src/test/java/org/asynchttpclient/request/body/FilePartLargeFileTest.java b/client/src/test/java/org/asynchttpclient/request/body/FilePartLargeFileTest.java
diff --git a/client/src/test/java/org/asynchttpclient/request/body/InputStreamPartLargeFileTest.java b/client/src/test/java/org/asynchttpclient/request/body/InputStreamPartLargeFileTest.java
diff --git a/client/src/test/java/org/asynchttpclient/request/body/PutFileTest.java b/client/src/test/java/org/asynchttpclient/request/body/PutFileTest.java

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,8 @@ public static int defaultReadTimeout() {`
`127`	`127`	`return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + READ_TIMEOUT_CONFIG);`
`128`	`128`	`}`
`129`	`129`
`130`		`- public static int defaultRequestTimeout() {`
`131`		`- return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + REQUEST_TIMEOUT_CONFIG);`
	`130`	`+ public static Duration defaultRequestTimeout() {`
	`131`	`+ return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getDuration(ASYNC_CLIENT_CONFIG_ROOT + REQUEST_TIMEOUT_CONFIG);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public static int defaultConnectionTtl() {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class RequestTimeoutTimerTask extends TimeoutTimerTask {`
`29`	`29`	`RequestTimeoutTimerTask(NettyResponseFuture<?> nettyResponseFuture,`
`30`	`30`	`NettyRequestSender requestSender,`
`31`	`31`	`TimeoutsHolder timeoutsHolder,`
`32`		`- int requestTimeout) {`
	`32`	`+ long requestTimeout) {`
`33`	`33`	`super(nettyResponseFuture, requestSender, timeoutsHolder);`
`34`	`34`	`this.requestTimeout = requestTimeout;`
`35`	`35`	`}`