All bytes are notified since 4.0.9

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/listener/TransferCompletionHandler.java

@@ -13,7 +13,6 @@
 package org.asynchttpclient.listener;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicLong;
 
 import org.asynchttpclient.AsyncCompletionHandlerBase;
 import org.asynchttpclient.FluentCaseInsensitiveStringsMap;
@@ -42,7 +41,7 @@
  * public void onBytesReceived(ByteBuffer buffer) {
  * }
  * <p/>
- * public void onBytesSent(ByteBuffer buffer) {
+ * public void onBytesSent(long amount, long current, long total) {
  * }
  * <p/>
  * public void onRequestResponseCompleted() {
@@ -62,8 +61,6 @@ public class TransferCompletionHandler extends AsyncCompletionHandlerBase {
     private final ConcurrentLinkedQueue<TransferListener> listeners = new ConcurrentLinkedQueue<TransferListener>();
     private final boolean accumulateResponseBytes;
     private TransferAdapter transferAdapter;
-    private AtomicLong bytesTransferred = new AtomicLong(0);
-    private AtomicLong totalBytesToTransfer = new AtomicLong(-1);
 
     /**
      * Create a TransferCompletionHandler that will not accumulate bytes. The resulting {@link org.asynchttpclient.Response#getResponseBody()},
@@ -136,10 +133,6 @@ public STATE onBodyPartReceived(final HttpResponseBodyPart content) throws Excep
 
     @Override
     public Response onCompleted(Response response) throws Exception {
-        if (bytesTransferred.get() > 0L) {
-            // onContentWriteCompleted hasn't been notified, it would have been set to -1L (async race)
-            onContentWriteCompleted();
-        }
         fireOnEnd();
         return response;
     }
@@ -152,33 +145,8 @@ public STATE onHeaderWriteCompleted() {
         return STATE.CONTINUE;
     }
 
-    @Override
-    public STATE onContentWriteCompleted() {
-        // onContentWriteProgress might not have been called on last write
-        long transferred = bytesTransferred.getAndSet(-1L);
-        long expected = totalBytesToTransfer.get();
-
-        if (expected <= 0L && transferAdapter != null) {
-            FluentCaseInsensitiveStringsMap headers = transferAdapter.getHeaders();
-            String contentLengthString = headers.getFirstValue("Content-Length");
-            if (contentLengthString != null)
-                expected = Long.valueOf(contentLengthString);
-        }
-
-        if (expected > 0L && transferred != expected) {
-            fireOnBytesSent(expected - transferred, expected, expected);
-        }
-
-        return STATE.CONTINUE;
-    }
-
     @Override
     public STATE onContentWriteProgress(long amount, long current, long total) {
-        bytesTransferred.addAndGet(amount);
-
-        if (total > 0L)
-            totalBytesToTransfer.set(total);
-
         fireOnBytesSent(amount, current, total);
         return STATE.CONTINUE;
     }