1412 reused timeouts for waits and covered corner cases for await, renamed state property

Author: MiErnst

client/src/main/java/org/asynchttpclient/AsyncHttpClientState.java

@@ -17,13 +17,13 @@
 
 public class AsyncHttpClientState {
 
-    private final AtomicBoolean closed;
+    private final AtomicBoolean closeTriggered;
 
-    public AsyncHttpClientState(AtomicBoolean closed) {
-        this.closed = closed;
+    public AsyncHttpClientState(AtomicBoolean closeTriggered) {
+        this.closeTriggered = closeTriggered;
     }
 
-    public boolean isClosedOrClosingIsTriggered() {
-        return closed.get();
+    public boolean isCloseTriggered() {
+        return closeTriggered.get();
     }
 }

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClient.java

@@ -118,7 +118,7 @@ public void close() {
 
             //see https://github.com/netty/netty/issues/2084#issuecomment-44822314
             try {
-                ThreadDeathWatcher.awaitInactivity(5, TimeUnit.SECONDS);
+                ThreadDeathWatcher.awaitInactivity(config.getShutdownTimeout(), TimeUnit.MILLISECONDS);
             } catch(InterruptedException t) {
                 // Ignore
             }

client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java

@@ -310,12 +310,12 @@ private void doClose() {
 
         //see https://github.com/netty/netty/issues/2084#issuecomment-44822314
         try {
-            GlobalEventExecutor.INSTANCE.awaitInactivity(5, TimeUnit.SECONDS);
+            GlobalEventExecutor.INSTANCE.awaitInactivity(config.getShutdownTimeout(), TimeUnit.MILLISECONDS);
         } catch(InterruptedException t) {
             // Ignore
+        } finally {
+            closeLatch.countDown();
         }
-        
-        closeLatch.countDown();
     }
 
     public void close() {
@@ -326,7 +326,7 @@ public void close() {
             doClose();
 
         try {
-            closeLatch.await();
+            closeLatch.await(config.getShutdownTimeout(), TimeUnit.MILLISECONDS);
         }
         catch (InterruptedException e) {
            // Ignore

client/src/main/java/org/asynchttpclient/netty/request/NettyChannelConnector.java

@@ -72,7 +72,7 @@ public void connect(final Bootstrap bootstrap, final NettyConnectListener<?> con
         try {
             connect0(bootstrap, connectListener, remoteAddress);
         } catch (RejectedExecutionException e) {
-            if (clientState.isClosedOrClosingIsTriggered()) {
+            if (clientState.isCloseTriggered()) {
                 LOGGER.info("Connect crash but engine is shutting down");
             } else {
                 connectListener.onFailure(null, e);

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -597,7 +597,7 @@ public void replayRequest(final NettyResponseFuture<?> future, FilterContext fc,
     }
 
     public boolean isClosed() {
-        return clientState.isClosedOrClosingIsTriggered();
+        return clientState.isCloseTriggered();
     }
 
     public void drainChannelAndExecuteNextRequest(final Channel channel, final NettyResponseFuture<?> future, Request nextRequest) {