Merge pull request AsyncHttpClient#33 from jloomis/master

separate responseTimeout from idleConnectionTimeout

Author: jfarcand

src/main/java/com/ning/http/client/AsyncHttpClientConfig.java

@@ -57,6 +57,7 @@ public class AsyncHttpClientConfig {
     protected int maxConnectionPerHost;
     protected int connectionTimeOutInMs;
     protected int idleConnectionInPoolTimeoutInMs;
+    protected int idleConnectionTimeoutInMs;
     protected int requestTimeoutInMs;
     protected boolean redirectEnabled;
     protected int maxDefaultRedirects;
@@ -89,6 +90,7 @@ private AsyncHttpClientConfig(int maxTotalConnections,
                                   int maxConnectionPerHost,
                                   int connectionTimeOutInMs,
                                   int idleConnectionInPoolTimeoutInMs,
+                                  int idleConnectionTimeoutInMs,
                                   int requestTimeoutInMs,
                                   boolean redirectEnabled,
                                   int maxDefaultRedirects,
@@ -117,6 +119,7 @@ private AsyncHttpClientConfig(int maxTotalConnections,
         this.maxConnectionPerHost = maxConnectionPerHost;
         this.connectionTimeOutInMs = connectionTimeOutInMs;
         this.idleConnectionInPoolTimeoutInMs = idleConnectionInPoolTimeoutInMs;
+        this.idleConnectionTimeoutInMs = idleConnectionTimeoutInMs;
         this.requestTimeoutInMs = requestTimeoutInMs;
         this.redirectEnabled = redirectEnabled;
         this.maxDefaultRedirects = maxDefaultRedirects;
@@ -188,10 +191,9 @@ public int getConnectionTimeoutInMs() {
      * Return the maximum time in millisecond an {@link com.ning.http.client.AsyncHttpClient} can stay idle.
      *
      * @return the maximum time in millisecond an {@link com.ning.http.client.AsyncHttpClient} can stay idle.
-     * @deprecated Please use {@link com.ning.http.client.AsyncHttpClientConfig#getIdleConnectionInPoolTimeoutInMs()}
      */
     public int getIdleConnectionTimeoutInMs() {
-        return idleConnectionInPoolTimeoutInMs;
+        return idleConnectionTimeoutInMs;
     }
 
     /**
@@ -451,6 +453,7 @@ public static class Builder {
         private int defaultMaxConnectionPerHost = Integer.getInteger(ASYNC_CLIENT + "defaultMaxConnectionsPerHost", -1);
         private int defaultConnectionTimeOutInMs = Integer.getInteger(ASYNC_CLIENT + "defaultConnectionTimeoutInMS", 60 * 1000);
         private int defaultIdleConnectionInPoolTimeoutInMs = Integer.getInteger(ASYNC_CLIENT + "defaultIdleConnectionInPoolTimeoutInMS", 60 * 1000);
+        private int defaultIdleConnectionTimeoutInMs = Integer.getInteger(ASYNC_CLIENT + "defaultIdleConnectionTimeoutInMS", 60 * 1000);
         private int defaultRequestTimeoutInMs = Integer.getInteger(ASYNC_CLIENT + "defaultRequestTimeoutInMS", 60 * 1000);
         private boolean redirectEnabled = Boolean.getBoolean(ASYNC_CLIENT + "defaultRedirectsEnabled");
         private int maxDefaultRedirects = Integer.getInteger(ASYNC_CLIENT + "defaultMaxRedirects", 5);
@@ -531,10 +534,9 @@ public Builder setConnectionTimeoutInMs(int defaultConnectionTimeOutInMs) {
          * @param defaultIdleConnectionTimeoutInMs
          *         the maximum time in millisecond an {@link com.ning.http.client.AsyncHttpClient} can stay idle.
          * @return a {@link Builder}
-         * @deprecated Please use {@link Builder#setIdleConnectionInPoolTimeoutInMs(int)}
          */
         public Builder setIdleConnectionTimeoutInMs(int defaultIdleConnectionTimeoutInMs) {
-            this.defaultIdleConnectionInPoolTimeoutInMs = defaultIdleConnectionTimeoutInMs;
+            this.defaultIdleConnectionTimeoutInMs = defaultIdleConnectionTimeoutInMs;
             return this;
         }
 
@@ -905,6 +907,7 @@ public Builder(AsyncHttpClientConfig prototype) {
             connectionsPool = prototype.getConnectionsPool();
             defaultConnectionTimeOutInMs = prototype.getConnectionTimeoutInMs();
             defaultIdleConnectionInPoolTimeoutInMs = prototype.getIdleConnectionInPoolTimeoutInMs();
+            defaultIdleConnectionTimeoutInMs = prototype.getIdleConnectionTimeoutInMs();
             defaultMaxConnectionPerHost = prototype.getMaxConnectionPerHost();
             maxDefaultRedirects = prototype.getMaxRedirects();
             defaultMaxTotalConnections = prototype.getMaxTotalConnections();
@@ -955,6 +958,7 @@ public AsyncHttpClientConfig build() {
                     defaultMaxConnectionPerHost,
                     defaultConnectionTimeOutInMs,
                     defaultIdleConnectionInPoolTimeoutInMs,
+                    defaultIdleConnectionTimeoutInMs,
                     defaultRequestTimeoutInMs,
                     redirectEnabled,
                     maxDefaultRedirects,

src/main/java/com/ning/http/client/AsyncHttpClientConfigBean.java

@@ -48,6 +48,7 @@ void configureDefaults() {
         maxConnectionPerHost = Integer.getInteger(ASYNC_CLIENT + "defaultMaxConnectionsPerHost", -1);
         connectionTimeOutInMs = Integer.getInteger(ASYNC_CLIENT + "defaultConnectionTimeoutInMS", 60 * 1000);
         idleConnectionInPoolTimeoutInMs = Integer.getInteger(ASYNC_CLIENT + "defaultIdleConnectionInPoolTimeoutInMS", 60 * 1000);
+        idleConnectionTimeoutInMs = Integer.getInteger(ASYNC_CLIENT + "defaultIdleConnectionTimeoutInMS", 60 * 1000);
         requestTimeoutInMs = Integer.getInteger(ASYNC_CLIENT + "defaultRequestTimeoutInMS", 60 * 1000);
         redirectEnabled = Boolean.getBoolean(ASYNC_CLIENT + "defaultRedirectsEnabled");
         maxDefaultRedirects = Integer.getInteger(ASYNC_CLIENT + "defaultMaxRedirects", 5);
@@ -110,6 +111,11 @@ public AsyncHttpClientConfigBean setIdleConnectionInPoolTimeoutInMs(int idleConn
         return this;
     }
 
+    public AsyncHttpClientConfigBean setIdleConnectionTimeoutInMs(int idleConnectionTimeoutInMs) {
+        this.idleConnectionTimeoutInMs = idleConnectionTimeoutInMs;
+        return this;
+    }
+
     public AsyncHttpClientConfigBean setRequestTimeoutInMs(int requestTimeoutInMs) {
         this.requestTimeoutInMs = requestTimeoutInMs;
         return this;

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -1844,7 +1844,7 @@ public static <T> NettyResponseFuture<T> newFuture(URI uri,
                                                        NettyAsyncHttpProvider provider) {
 
         NettyResponseFuture<T> f = new NettyResponseFuture<T>(uri, request, asyncHandler, nettyRequest,
-                requestTimeout(config, request.getPerRequestConfig()), provider);
+                requestTimeout(config, request.getPerRequestConfig()), config.getIdleConnectionTimeoutInMs(), provider);
 
         if (request.getHeaders().getFirstValue("Expect") != null
                 && request.getHeaders().getFirstValue("Expect").equalsIgnoreCase("100-Continue")) {

src/main/java/com/ning/http/client/providers/netty/NettyResponseFuture.java

@@ -60,6 +60,7 @@ enum STATE {
     private final AtomicBoolean isCancelled = new AtomicBoolean(false);
     private AsyncHandler<V> asyncHandler;
     private final int responseTimeoutInMs;
+    private final int idleConnectionTimeoutInMs;
     private Request request;
     private HttpRequest nettyRequest;
     private final AtomicReference<V> content = new AtomicReference<V>();
@@ -72,6 +73,7 @@ enum STATE {
     private final AtomicBoolean inAuth = new AtomicBoolean(false);
     private final AtomicBoolean statusReceived = new AtomicBoolean(false);
     private final AtomicLong touch = new AtomicLong(System.currentTimeMillis());
+    private final long start = System.currentTimeMillis();
     private final NettyAsyncHttpProvider asyncHttpProvider;
     private final AtomicReference<STATE> state = new AtomicReference<STATE>(STATE.NEW);
     private final AtomicBoolean contentProcessed = new AtomicBoolean(false);
@@ -89,10 +91,12 @@ public NettyResponseFuture(URI uri,
                                AsyncHandler<V> asyncHandler,
                                HttpRequest nettyRequest,
                                int responseTimeoutInMs,
+                               int idleConnectionTimeoutInMs,
                                NettyAsyncHttpProvider asyncHttpProvider) {
 
         this.asyncHandler = asyncHandler;
         this.responseTimeoutInMs = responseTimeoutInMs;
+        this.idleConnectionTimeoutInMs = idleConnectionTimeoutInMs;
         this.request = request;
         this.nettyRequest = nettyRequest;
         this.uri = uri;
@@ -169,7 +173,9 @@ public boolean cancel(boolean force) {
      * @return <code>true</code> if response has expired and should be terminated.
      */
     public boolean hasExpired() {
-        return responseTimeoutInMs != -1 && ((System.currentTimeMillis() - touch.get()) >= responseTimeoutInMs);
+        long now = System.currentTimeMillis();
+        return idleConnectionTimeoutInMs != -1 && ((now - touch.get()) >= idleConnectionTimeoutInMs)
+                || responseTimeoutInMs != -1 && ((now - start) >= responseTimeoutInMs);
     }
 
     /**
@@ -202,9 +208,6 @@ public V get(long l, TimeUnit tu) throws InterruptedException, TimeoutException,
                 latch.await();
             } else {
                 expired = !latch.await(l, tu);
-                if (!contentProcessed.get() && expired && ((System.currentTimeMillis() - touch.get()) <= l)) {
-                    return get(l, tu);
-                }
             }
 
             if (expired) {