Merge branch 'master' of http://github.com/AsyncHttpClient/async-http-client

Author: jloomis

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

@@ -100,7 +100,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -315,17 +314,20 @@ public void operationComplete(ChannelFuture cf) {
 
  try {
  future.touch();
- future.setReaperFuture(config.reaper().scheduleAtFixedRate(new Runnable() {
- public void run() {
- if (future.hasExpired()) {
- if (log.isDebugEnabled()) {
- log.debug("Request Timeout expired for " + future);
+ int delay = requestTimeout(config, future.getRequest().getPerRequestConfig());
+ if (delay != -1) {
+ future.setReaperFuture(config.reaper().scheduleAtFixedRate(new Runnable() {
+ public void run() {
+ if (future.hasExpired()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Request Timeout expired for " + future);
+ }
+ future.abort(new TimeoutException("Request timed out."));
+ closeChannel(channel.getPipeline().getContext(NettyAsyncHttpProvider.class));
  }
- future.abort(new TimeoutException("Request timed out."));
- closeChannel(channel.getPipeline().getContext(NettyAsyncHttpProvider.class));
  }
- }
- }, 0, requestTimeout(config, future.getRequest().getPerRequestConfig()), TimeUnit.MILLISECONDS));
+ }, 0, delay, TimeUnit.MILLISECONDS));
+ }
  } catch (RejectedExecutionException ex) {
  future.abort(ex);
  }

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

@@ -107,9 +107,11 @@ public boolean cancel(boolean force) {
 
  /**
  * Is the Future still valid
+ *
+ * @return <code>true</code> iff response has expired and should be terminated.
  */
  public boolean hasExpired(){
- return ((System.currentTimeMillis() - touch.get()) > responseTimeoutInMs );
+ return responseTimeoutInMs != -1 && ((System.currentTimeMillis() - touch.get()) > responseTimeoutInMs);
  }
 
  /**
@@ -130,7 +132,13 @@ public V get() throws InterruptedException, ExecutionException{
  /* @Override */
  public V get(long l, TimeUnit tu) throws InterruptedException, TimeoutException, ExecutionException {
  if (!isDone() && !isCancelled()) {
- if (!latch.await(l, tu)) {
+ boolean failed = false;
+ if (l == -1) {
+ latch.await();
+ } else {
+ failed = !latch.await(l, tu);
+ }
+ if (failed) {
  isCancelled.set(true);
  TimeoutException te = new TimeoutException("No response received");
  try {

src/test/java/com/ning/http/client/async/PerRequestTimeoutTest.java

@@ -33,6 +33,7 @@
 import java.util.concurrent.TimeoutException;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
@@ -86,6 +87,25 @@ public void testRequestTimeout() throws IOException {
  }
  }
 
+ @Test(groups = "standalone")
+ public void testGlobalDefaultPerRequestInfiniteTimeout() throws IOException {
+ AsyncHttpClient client = new AsyncHttpClient(new AsyncHttpClientConfig.Builder().setRequestTimeoutInMs(100).build());
+ PerRequestConfig requestConfig = new PerRequestConfig();
+ requestConfig.setRequestTimeoutInMs(-1);
+ Future<Response> responseFuture =
+ client.prepareGet(getTargetUrl()).setPerRequestConfig(requestConfig).execute();
+ try {
+ Response response = responseFuture.get();
+ assertNotNull(response);
+ client.close();
+ } catch (InterruptedException e) {
+ fail("Interrupted.", e);
+ } catch (ExecutionException e) {
+ assertTrue(e.getCause() instanceof TimeoutException);
+ assertEquals(e.getCause().getMessage(), "Request timed out.");
+ }
+ }
+
  @Test(groups = "standalone")
  public void testGlobalRequestTimeout() throws IOException {
  AsyncHttpClient client = new AsyncHttpClient(new AsyncHttpClientConfig.Builder().setRequestTimeoutInMs(100).build());