Incremental changes for AsyncHttpClient#328. Resolution still in progress. Fewer false positives are present however with these changes and recent updates to Grizzly.

Author: rlubke

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -220,6 +220,7 @@ public DelayedExecutor.Resolver<Connection> getResolver() {
         return resolver;
     }
 
+
     // ------------------------------------------------------- Protected Methods
 
 
@@ -269,7 +270,7 @@ public long getTimeout(FilterChainContext ctx) {
                                     return requestTimeout;
                                 }
                             }
-                            return timeout;
+                            return IdleTimeoutFilter.FOREVER;
                         }
                     };
             final IdleTimeoutFilter timeoutFilter = new IdleTimeoutFilter(timeoutExecutor,
@@ -484,8 +485,10 @@ public void updated(WriteResult result) {
     void timeout(final Connection c) {
 
         final HttpTransactionContext context = HttpTransactionContext.get(c);
-        HttpTransactionContext.set(c, null);
-        context.abort(new TimeoutException("Timeout exceeded"));
+        if (context != null) {
+            HttpTransactionContext.set(c, null);
+            context.abort(new TimeoutException("Timeout exceeded"));
+        }
 
     }