Fix build

Author: Stephane Landelle

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/NettyRequestSender.java

@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
+import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.util.Map;
@@ -66,7 +67,6 @@
 import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
 import org.asynchttpclient.providers.netty4.future.NettyResponseFutures;
 import org.asynchttpclient.providers.netty4.request.FeedableBodyGenerator.FeedListener;
-import org.asynchttpclient.providers.netty4.request.NettyConnectListener.Builder;
 import org.asynchttpclient.util.AsyncHttpProviderUtils;
 import org.asynchttpclient.util.ProxyUtils;
 import org.asynchttpclient.websocket.WebSocketUpgradeHandler;
@@ -121,7 +121,7 @@ public boolean retry(Channel channel, NettyResponseFuture<?> future) {
         }
         return success;
     }
-    
+
     public boolean applyIoExceptionFiltersAndReplayRequest(ChannelHandlerContext ctx, NettyResponseFuture<?> future, IOException e) throws IOException {
 
         boolean replayed = false;
@@ -224,26 +224,35 @@ private void performSyncConnect(ChannelFuture channelFuture, URI uri, boolean ac
 
         try {
             channelFuture.syncUninterruptibly();
-            cl.onFutureSuccess(channelFuture.channel());
-
         } catch (Throwable t) {
             if (t.getCause() != null)
                 t = t.getCause();
 
-            IOException ioe = null;
-            if (t instanceof IOException)
-                ioe = IOException.class.cast(t);
+            ConnectException ce = null;
+            if (t instanceof ConnectException)
+                ce = ConnectException.class.cast(t);
             else
-                ioe = new IOException(t.getMessage(), t);
+                ce = new ConnectException(t.getMessage());
 
-            if (acquiredConnection)
+            if (acquiredConnection) {
                 channels.releaseFreeConnections();
+            }
+            channelFuture.cancel(false);
+            channels.abort(cl.future(), ce);
+        }
 
-            channels.abort(cl.future(), ioe);
+        try {
+            cl.operationComplete(channelFuture);
+        } catch (Exception e) {
+            if (acquiredConnection) {
+                channels.releaseFreeConnections();
+            }
+            IOException ioe = new IOException(e.getMessage());
+            ioe.initCause(e);
             try {
                 asyncHandler.onThrowable(ioe);
-            } catch (Throwable t2) {
-                LOGGER.warn("asyncHandler.onThrowable()", t2);
+            } catch (Throwable t) {
+                LOGGER.warn("c.operationComplete()", t);
             }
             throw ioe;
         }

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/ProgressListener.java

@@ -102,7 +102,7 @@ public void operationComplete(ChannelProgressiveFuture cf) {
     @Override
     public void operationProgressed(ChannelProgressiveFuture f, long progress, long total) {
         future.touch();
-        if (asyncHandler instanceof ProgressAsyncHandler) {
+        if (!notifyHeaders && asyncHandler instanceof ProgressAsyncHandler) {
             long lastProgressValue = lastProgress.getAndSet(progress);
             ProgressAsyncHandler.class.cast(asyncHandler).onContentWriteProgress(progress - lastProgressValue, progress, total);
         }