Author: markt
Date: Thu Jan 8 13:10:10 2015
New Revision: 1650272
URL: http://svn.apache.org/r1650272
Log:
Pull up sendAck()
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1650272&r1=1650271&r2=1650272&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Thu
Jan 8 13:10:10 2015
@@ -378,7 +378,15 @@ public abstract class AbstractOutputBuff
}
- 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.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1650272&r1=1650271&r2=1650272&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Thu
Jan 8 13:10:10 2015
@@ -87,22 +87,6 @@ public class InternalAprOutputBuffer ext
}
- // ------------------------------------------------ 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
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java?rev=1650272&r1=1650271&r2=1650272&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
Thu Jan 8 13:10:10 2015
@@ -223,18 +223,6 @@ public class InternalNio2OutputBuffer ex
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
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1650272&r1=1650271&r2=1650272&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu
Jan 8 13:10:10 2015
@@ -63,22 +63,6 @@ public class InternalNioOutputBuffer ext
}
- // ------------------------------------------------ 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 @@ public class InternalNioOutputBuffer ext
}
- /**
- * Callback to write data from the buffer.
- */
@Override
protected boolean flushBuffer(boolean block) throws IOException {
return socketWrapper.flush(block);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
