Drop implementation specific InternalXxxOutputBuffer implementations and

make the abstract base class the only concrete implementation.

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

java/org/apache/coyote/http11/AbstractHttp11Processor.java

@@ -78,7 +78,7 @@ public abstract class AbstractHttp11Processor<S> extends AbstractProcessor<S> {
     /**
      * Output.
      */
-    protected AbstractOutputBuffer<S> outputBuffer;
+    protected Http11OutputBuffer<S> outputBuffer;
 
 
     /**
@@ -624,7 +624,7 @@ protected AbstractInputBuffer<S> getInputBuffer() {
      * Exposes output buffer to super class to allow better code re-use.
      * @return  The output buffer used by the processor.
      */
-    protected AbstractOutputBuffer<S> getOutputBuffer() {
+    protected Http11OutputBuffer<S> getOutputBuffer() {
         return outputBuffer;
     }
 
@@ -858,12 +858,7 @@ public final void action(ActionCode actionCode, Object param) {
         }
         case NB_WRITE_INTEREST: {
             AtomicBoolean isReady = (AtomicBoolean)param;
-            try {
-                isReady.set(getOutputBuffer().isReady());
-            } catch (IOException e) {
-                getLog().debug("isReady() failed", e);
-                setErrorState(ErrorState.CLOSE_NOW, e);
-            }
+            isReady.set(getOutputBuffer().isReady());
             break;
         }
         case NB_READ_INTEREST: {

java/org/apache/coyote/http11/Http11AprProcessor.java

@@ -60,7 +60,7 @@ public Http11AprProcessor(int headerBufferSize, AprEndpoint endpoint,
         inputBuffer = new InternalAprInputBuffer(request, headerBufferSize);
         request.setInputBuffer(getInputBuffer());
 
-        outputBuffer = new InternalAprOutputBuffer(response, headerBufferSize);
+        outputBuffer = new Http11OutputBuffer<>(response, headerBufferSize);
         response.setOutputBuffer(getOutputBuffer());
 
         initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);

java/org/apache/coyote/http11/Http11Nio2Processor.java

@@ -64,7 +64,7 @@ public Http11Nio2Processor(int maxHttpHeaderSize, Nio2Endpoint endpoint,
         inputBuffer = new InternalNio2InputBuffer(request, maxHttpHeaderSize);
         request.setInputBuffer(getInputBuffer());
 
-        outputBuffer = new InternalNio2OutputBuffer(response, maxHttpHeaderSize);
+        outputBuffer = new Http11OutputBuffer<>(response, maxHttpHeaderSize);
         response.setOutputBuffer(getOutputBuffer());
 
         initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
@@ -99,7 +99,7 @@ protected void registerForEvent(boolean read, boolean write) {
             ((InternalNio2InputBuffer) getInputBuffer()).registerReadInterest();
         }
         if (write) {
-            ((InternalNio2OutputBuffer) getOutputBuffer()).registerWriteInterest();
+            ((Http11OutputBuffer<?>) getOutputBuffer()).registerWriteInterest();
         }
     }
 

java/org/apache/coyote/http11/Http11NioProcessor.java

@@ -65,7 +65,7 @@ public Http11NioProcessor(int maxHttpHeaderSize, NioEndpoint endpoint,
         inputBuffer = new InternalNioInputBuffer(request, maxHttpHeaderSize);
         request.setInputBuffer(getInputBuffer());
 
-        outputBuffer = new InternalNioOutputBuffer(response, maxHttpHeaderSize);
+        outputBuffer = new Http11OutputBuffer<>(response, maxHttpHeaderSize);
         response.setOutputBuffer(getOutputBuffer());
 
         initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);

java/org/apache/coyote/http11/AbstractOutputBuffer.java → java/org/apache/coyote/http11/Http11OutputBuffer.java

@@ -33,7 +33,7 @@
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.res.StringManager;
 
-public abstract class AbstractOutputBuffer<S> implements OutputBuffer {
+public class Http11OutputBuffer<S> implements OutputBuffer {
 
     // ----------------------------------------------------- Instance Variables
 
@@ -103,7 +103,7 @@ public abstract class AbstractOutputBuffer<S> implements OutputBuffer {
     protected long byteCount = 0;
 
 
-    protected AbstractOutputBuffer(Response response, int headerBufferSize) {
+    protected Http11OutputBuffer(Response response, int headerBufferSize) {
 
         this.response = response;
 
@@ -134,7 +134,7 @@ protected AbstractOutputBuffer(Response response, int headerBufferSize) {
     /**
      * Logger.
      */
-    private static final Log log = LogFactory.getLog(AbstractOutputBuffer.class);
+    private static final Log log = LogFactory.getLog(Http11OutputBuffer.class);
 
     // ------------------------------------------------------------- Properties
 
@@ -344,6 +344,7 @@ public void endRequest() throws IOException {
 
     public void init(SocketWrapperBase<S> socketWrapper) {
         this.socketWrapper = socketWrapper;
+        // TODO: Ensure write buffer is >= header buffer size
     }
 
 
@@ -586,12 +587,16 @@ private void checkLengthBeforeWrite(int length) {
     }
 
 
-    protected abstract void addToBB(byte[] buf, int offset, int length) throws IOException;
+    protected void addToBB(byte[] buf, int offset, int length) throws IOException {
+        socketWrapper.write(isBlocking(), buf, offset, length);
+    }
 
 
     //------------------------------------------------------ Non-blocking writes
 
-    protected abstract void registerWriteInterest();
+    protected void registerWriteInterest() {
+        socketWrapper.registerWriteInterest();
+    }
 
 
     /**
@@ -602,7 +607,9 @@ private void checkLengthBeforeWrite(int length) {
      *          happen in non-blocking mode) else <code>false</code>.
      * @throws IOException
      */
-    protected abstract boolean flushBuffer(boolean block) throws IOException;
+    protected boolean flushBuffer(boolean block) throws IOException  {
+        return socketWrapper.flush(block);
+    }
 
 
     /**
@@ -613,7 +620,7 @@ protected final boolean isBlocking() {
     }
 
 
-    protected final boolean isReady() throws IOException {
+    protected final boolean isReady() {
         boolean result = !hasDataToWrite();
         if (!result) {
             registerWriteInterest();

test/org/apache/coyote/http11/filters/TesterOutputBuffer.java

@@ -22,14 +22,14 @@
 
 import org.apache.coyote.OutputBuffer;
 import org.apache.coyote.Response;
-import org.apache.coyote.http11.AbstractOutputBuffer;
+import org.apache.coyote.http11.Http11OutputBuffer;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
 /**
  * Output buffer for use in unit tests. This is a minimal implementation.
  */
-public class TesterOutputBuffer extends AbstractOutputBuffer<Socket> {
+public class TesterOutputBuffer extends Http11OutputBuffer<Socket> {
 
     /**
      * Underlying output stream.