Pull up commit()

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1648904 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 1, 2015 · 1d0b1c2 · 1d0b1c2
1 parent f3c7dba
commit 1d0b1c2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 62 deletions.
diff --git a/java/org/apache/coyote/http11/AbstractOutputBuffer.java b/java/org/apache/coyote/http11/AbstractOutputBuffer.java
@@ -373,7 +373,21 @@ public abstract void init(SocketWrapperBase<S> socketWrapper,
 
     public abstract void sendAck() throws IOException;
 
-    protected abstract void commit() throws IOException;
+    /**
+     * Commit the response.
+     *
+     * @throws IOException an underlying I/O error occurred
+     */
+    protected void commit() throws IOException {
+        // The response is now committed
+        committed = true;
+        response.setCommitted(true);
+
+        if (pos > 0) {
+            // Sending the response header buffer
+            addToBB(headerBuffer, 0, pos);
+        }
+    }
 
 
     /**

diff --git a/java/org/apache/coyote/http11/InternalAprOutputBuffer.java b/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
@@ -113,27 +113,6 @@ public void sendAck() throws IOException {
 
     // ------------------------------------------------------ Protected Methods
 
-
-    /**
-     * Commit the response.
-     *
-     * @throws IOException an underlying I/O error occurred
-     */
-    @Override
-    protected void commit() throws IOException {
-
-        // The response is now committed
-        committed = true;
-        response.setCommitted(true);
-
-        if (pos > 0) {
-            // Sending the response header buffer
-            socketWriteBuffer.put(headerBuffer, 0, pos);
-        }
-
-    }
-
-
     @Override
     protected synchronized void addToBB(byte[] buf, int offset, int length)
             throws IOException {

diff --git a/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java b/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
@@ -248,25 +248,6 @@ public void sendAck() throws IOException {
 
     // ------------------------------------------------------ Protected Methods
 
-    /**
-     * Commit the response.
-     *
-     * @throws IOException an underlying I/O error occurred
-     */
-    @Override
-    protected void commit() throws IOException {
-
-        // The response is now committed
-        committed = true;
-        response.setCommitted(true);
-
-        if (pos > 0) {
-            // Sending the response header buffer
-            addToBB(headerBuffer, 0, pos);
-        }
-
-    }
-
     private static boolean arrayHasData(ByteBuffer[] byteBuffers) {
         for (ByteBuffer byteBuffer : byteBuffers) {
             if (byteBuffer.hasRemaining()) {
@@ -451,7 +432,7 @@ protected boolean hasBufferedData() {
     }
 
     @Override
-    public void registerWriteInterest() {
+    protected void registerWriteInterest() {
         synchronized (completionHandler) {
             if (writePending.availablePermits() == 0) {
                 interest = true;

diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
@@ -147,26 +147,6 @@ private synchronized int writeToSocket(ByteBuffer bytebuffer, boolean block, boo
 
     // ------------------------------------------------------ Protected Methods
 
-    /**
-     * Commit the response.
-     *
-     * @throws IOException an underlying I/O error occurred
-     */
-    @Override
-    protected void commit() throws IOException {
-
-        // The response is now committed
-        committed = true;
-        response.setCommitted(true);
-
-        if (pos > 0) {
-            // Sending the response header buffer
-            addToBB(headerBuffer, 0, pos);
-        }
-
-    }
-
-
     @Override
     protected synchronized void addToBB(byte[] buf, int offset, int length)
             throws IOException {