Deque<ByteBufferHolder> is a little more complex than List<ByteBuffer>

but using the same structure for all connectors will improve code re-use
and thereby improve maintainability.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1650268 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/coyote/http11/InternalNio2OutputBuffer.java

@@ -31,6 +31,7 @@
 import javax.servlet.RequestDispatcher;
 
 import org.apache.coyote.Response;
+import org.apache.tomcat.util.buf.ByteBufferHolder;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.Nio2Channel;
 import org.apache.tomcat.util.net.Nio2Endpoint;
@@ -78,11 +79,6 @@ public InternalNio2OutputBuffer(Response response, int headerBufferSize) {
      */
     protected AbstractEndpoint<Nio2Channel> endpoint = null;
 
-    /**
-     * Used instead of the deque since it looks equivalent and simpler.
-     */
-    protected ArrayList<ByteBuffer> bufferedWrites = new ArrayList<>();
-
     /**
      * Exception that occurred during writing.
      */
@@ -109,9 +105,9 @@ public void completed(Integer nBytes, ByteBuffer attachment) {
                         if (attachment.hasRemaining()) {
                             arrayList.add(attachment);
                         }
-                        for (ByteBuffer buffer : bufferedWrites) {
+                        for (ByteBufferHolder buffer : bufferedWrites) {
                             buffer.flip();
-                            arrayList.add(buffer);
+                            arrayList.add(buffer.getBuf());
                         }
                         bufferedWrites.clear();
                         ByteBuffer[] array = arrayList.toArray(EMPTY_BUF_ARRAY);
@@ -164,9 +160,9 @@ public void completed(Long nBytes, ByteBuffer[] attachment) {
                                 arrayList.add(buffer);
                             }
                         }
-                        for (ByteBuffer buffer : bufferedWrites) {
+                        for (ByteBufferHolder buffer : bufferedWrites) {
                             buffer.flip();
-                            arrayList.add(buffer);
+                            arrayList.add(buffer.getBuf());
                         }
                         bufferedWrites.clear();
                         ByteBuffer[] array = arrayList.toArray(EMPTY_BUF_ARRAY);
@@ -303,7 +299,7 @@ protected void addToBB(byte[] buf, int offset, int length)
     private void addToBuffers(byte[] buf, int offset, int length) {
         ByteBuffer buffer = ByteBuffer.allocate(length);
         buffer.put(buf, offset, length);
-        bufferedWrites.add(buffer);
+        bufferedWrites.add(new ByteBufferHolder(buffer, false));
     }
 
 
@@ -336,8 +332,9 @@ private boolean flushBufferInternal(boolean block, boolean hasPermit) throws IOE
             }
             try {
                 if (bufferedWrites.size() > 0) {
-                    for (ByteBuffer buffer : bufferedWrites) {
-                        buffer.flip();
+                    for (ByteBufferHolder holder : bufferedWrites) {
+                        holder.flip();
+                        ByteBuffer buffer = holder.getBuf();
                         while (buffer.hasRemaining()) {
                             if (socketWrapper.getSocket().write(buffer).get(socketWrapper.getTimeout(), TimeUnit.MILLISECONDS).intValue() < 0) {
                                 throw new EOFException(sm.getString("iob.failedwrite"));
@@ -383,9 +380,9 @@ private boolean flushBufferInternal(boolean block, boolean hasPermit) throws IOE
                         if (socketWriteBuffer.hasRemaining()) {
                             arrayList.add(socketWriteBuffer);
                         }
-                        for (ByteBuffer buffer : bufferedWrites) {
+                        for (ByteBufferHolder buffer : bufferedWrites) {
                             buffer.flip();
-                            arrayList.add(buffer);
+                            arrayList.add(buffer.getBuf());
                         }
                         bufferedWrites.clear();
                         ByteBuffer[] array = arrayList.toArray(EMPTY_BUF_ARRAY);