Pull up sendAck()

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

Hide file tree

Showing 4 changed files with 9 additions and 48 deletions.
diff --git a/java/org/apache/coyote/http11/AbstractOutputBuffer.java b/java/org/apache/coyote/http11/AbstractOutputBuffer.java
@@ -378,7 +378,15 @@ public void init(SocketWrapperBase<S> socketWrapper) {
     }
 
 
-    public abstract void sendAck() throws IOException;
+    public void sendAck() throws IOException {
+        if (!committed) {
+            addToBB(Constants.ACK_BYTES, 0, Constants.ACK_BYTES.length);
+            if (flushBuffer(true)) {
+                throw new IOException(sm.getString("iob.failedwrite.ack"));
+            }
+        }
+    }
+
 
     /**
      * Commit the response.

diff --git a/java/org/apache/coyote/http11/InternalAprOutputBuffer.java b/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
@@ -87,22 +87,6 @@ public void recycle() {
     }
 
 
-    // ------------------------------------------------ HTTP/1.1 Output Methods
-
-    /**
-     * Send an acknowledgment.
-     */
-    @Override
-    public void sendAck() throws IOException {
-        if (!committed) {
-            addToBB(Constants.ACK_BYTES, 0, Constants.ACK_BYTES.length);
-            if (flushBuffer(true)) {
-                throw new IOException(sm.getString("iob.failedwrite.ack"));
-            }
-        }
-    }
-
-
     // ------------------------------------------------------ Protected Methods
 
     @Override

diff --git a/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java b/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
@@ -223,18 +223,6 @@ public void nextRequest() {
         writeBufferFlipped = false;
     }
 
-    // ------------------------------------------------ HTTP/1.1 Output Methods
-
-    /**
-     * Send an acknowledgment.
-     */
-    @Override
-    public void sendAck() throws IOException {
-        if (!committed) {
-            addToBB(Constants.ACK_BYTES, 0, Constants.ACK_BYTES.length);
-            flushBuffer(true);
-        }
-    }
 
     // ------------------------------------------------------ Protected Methods
 

diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
@@ -63,22 +63,6 @@ public void recycle() {
     }
 
 
-    // ------------------------------------------------ HTTP/1.1 Output Methods
-
-    /**
-     * Send an acknowledgment.
-     */
-    @Override
-    public void sendAck() throws IOException {
-        if (!committed) {
-            addToBB(Constants.ACK_BYTES, 0, Constants.ACK_BYTES.length);
-            if (flushBuffer(true)) {
-                throw new IOException(sm.getString("iob.failedwrite.ack"));
-            }
-        }
-    }
-
-
     // ------------------------------------------------------ Protected Methods
 
     @Override
@@ -87,9 +71,6 @@ protected synchronized void addToBB(byte[] buf, int offset, int length) throws I
     }
 
 
-    /**
-     * Callback to write data from the buffer.
-     */
     @Override
     protected boolean flushBuffer(boolean block) throws IOException {
         return socketWrapper.flush(block);