Two fixes:

  - Test bug:  server-side handler assuming the PUT content would arrive in a single chunk and ignored the return result from the read() call.
  - Grizzly bug:  TransferListeners were only notified of content when updated and not when
       completed.  So the last delta was missing.

Author: rlubke

api/src/test/java/org/asynchttpclient/async/TransferListenerTest.java

@@ -70,8 +70,13 @@ public void handle(String s, org.eclipse.jetty.server.Request r, HttpServletRequ
             }
             byte[] bytes = new byte[size];
             if (bytes.length > 0) {
-                httpRequest.getInputStream().read(bytes);
-                httpResponse.getOutputStream().write(bytes);
+                int read = 0;
+                while (read != -1) {
+                    read = httpRequest.getInputStream().read(bytes);
+                    if (read > 0) {
+                        httpResponse.getOutputStream().write(bytes, 0, read);
+                    }
+                }
             }
 
             httpResponse.setStatus(200);
@@ -129,7 +134,7 @@ public void onThrowable(Throwable t) {
                 assertEquals(response.getStatusCode(), 200);
                 assertNotNull(hRead.get());
                 assertNotNull(hSent.get());
-                assertNotNull(bb.get());
+                assertNull(bb.get());
                 assertNull(throwable.get());
             } catch (IOException ex) {
                 fail("Should have timed out");

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/FileBodyHandler.java

@@ -92,20 +92,12 @@ public boolean doHandle(final FilterChainContext ctx,
 
                 @Override
                 public void updated(WriteResult result) {
-                    final AsyncHandler handler = context.getHandler();
-                    if (handler != null) {
-                        if (handler instanceof TransferCompletionHandler) {
-                            // WriteResult keeps a track of the total amount written,
-                            // so we need to calculate the delta ourselves.
-                            final long resultTotal = result.getWrittenSize();
-                            final long written = resultTotal - context.getTotalBodyWritten().get();
-                            final long total = context.getTotalBodyWritten().addAndGet(written);
-                            ((TransferCompletionHandler) handler).onContentWriteProgress(
-                                    written,
-                                    total,
-                                    requestPacket.getContentLength());
-                        }
-                    }
+                    notifyHandlerIfNeeded(context, requestPacket, result);
+                }
+
+                @Override
+                public void completed(WriteResult result) {
+                    notifyHandlerIfNeeded(context, requestPacket, result);
                 }
             });
         }
@@ -117,6 +109,27 @@ public void updated(WriteResult result) {
     // --------------------------------------------------------- Private Methods
 
 
+    private static void notifyHandlerIfNeeded(final HttpTransactionContext context,
+                                              final HttpRequestPacket requestPacket,
+                                              final WriteResult writeResult) {
+        final AsyncHandler handler = context.getHandler();
+        if (handler != null) {
+            if (handler instanceof TransferCompletionHandler) {
+                // WriteResult keeps a track of the total amount written,
+                // so we need to calculate the delta ourselves.
+                final long resultTotal = writeResult.getWrittenSize();
+                final long written =
+                        (resultTotal - context.getTotalBodyWritten().get());
+                final long total = context.getTotalBodyWritten().addAndGet(written);
+                ((TransferCompletionHandler) handler).onContentWriteProgress(
+                        written,
+                        total,
+                        requestPacket.getContentLength());
+            }
+        }
+    }
+
+
     private static boolean configSendFileSupport() {
         return !((System.getProperty("os.name").equalsIgnoreCase("linux")
                 && !linuxSendFileSupported())