--- old/test/java/net/httpclient/HttpInputStreamTest.java	2017-08-03 17:42:15.000000000 +0100
+++ new/test/java/net/httpclient/HttpInputStreamTest.java	2017-08-03 17:42:15.000000000 +0100
@@ -33,6 +33,7 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Locale;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -186,10 +187,13 @@
             }
 
             @Override
-            public synchronized void onNext(ByteBuffer t) {
+            public synchronized void onNext(List<ByteBuffer> t) {
+		if (t.size() > 1) 
+		    System.out.println ("XXX " + t.size());
                 try {
                     if (DEBUG) System.err.println("next buffer received");
-                    buffers.put(t);
+		    for (ByteBuffer b : t)
+                    	buffers.put(b);
                     if (DEBUG) System.err.println("buffered offered");
                 } catch (Exception ex) {
                     failed = ex;
@@ -209,7 +213,7 @@
             @Override
             public synchronized void onComplete() {
                 subscription = null;
-                onNext(LAST);
+                onNext(List.of(LAST));
             }
 
             @Override