You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/05/01 18:46:47 UTC
svn commit: r1478089 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractOutputBuffer.java InternalAprOutputBuffer.java
InternalNioOutputBuffer.java InternalOutputBuffer.java
Author: markt
Date: Wed May 1 16:46:47 2013
New Revision: 1478089
URL: http://svn.apache.org/r1478089
Log:
Align endRequest() implementations and pull-up changes in over-riding methods
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/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.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=1478089&r1=1478088&r2=1478089&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Wed May 1 16:46:47 2013
@@ -310,21 +310,19 @@ public abstract class AbstractOutputBuff
byteCount = 0;
}
+
/**
* End request.
*
* @throws IOException an underlying I/O error occurred
*/
- public void endRequest()
- throws IOException {
+ public void endRequest() throws IOException {
if (!committed) {
-
// Send the connector a request for commit. The connector should
// then validate the headers, send them (using sendHeader) and
// set the filters accordingly.
response.action(ActionCode.COMMIT, null);
-
}
if (finished)
@@ -332,6 +330,9 @@ public abstract class AbstractOutputBuff
if (lastActiveFilter != -1)
activeFilters[lastActiveFilter].end();
+
+ flushBuffer(true);
+
finished = true;
}
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=1478089&r1=1478088&r2=1478089&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Wed May 1 16:46:47 2013
@@ -20,7 +20,6 @@ package org.apache.coyote.http11;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.coyote.ActionCode;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
import org.apache.tomcat.jni.Socket;
@@ -107,37 +106,6 @@ public class InternalAprOutputBuffer ext
}
- /**
- * End request.
- *
- * @throws IOException an underlying I/O error occurred
- */
- @Override
- public void endRequest()
- throws IOException {
-
- if (!committed) {
-
- // Send the connector a request for commit. The connector should
- // then validate the headers, send them (using sendHeader) and
- // set the filters accordingly.
- response.action(ActionCode.COMMIT, null);
-
- }
-
- if (finished)
- return;
-
- if (lastActiveFilter != -1)
- activeFilters[lastActiveFilter].end();
-
- flushBuffer(true);
-
- finished = true;
-
- }
-
-
// ------------------------------------------------ HTTP/1.1 Output 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=1478089&r1=1478088&r2=1478089&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Wed May 1 16:46:47 2013
@@ -162,20 +162,8 @@ public class InternalNioOutputBuffer ext
}
- /**
- * End request.
- *
- * @throws IOException an underlying I/O error occurred
- */
- @Override
- public void endRequest() throws IOException {
- super.endRequest();
- flushBuffer(true);
- }
-
// ------------------------------------------------ HTTP/1.1 Output Methods
-
/**
* Send an acknowledgment.
*/
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1478089&r1=1478088&r2=1478089&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Wed May 1 16:46:47 2013
@@ -127,21 +127,8 @@ public class InternalOutputBuffer extend
}
- /**
- * End request.
- *
- * @throws IOException an underlying I/O error occurred
- */
- @Override
- public void endRequest() throws IOException {
- super.endRequest();
- flushBuffer(true);
- }
-
-
// ------------------------------------------------ HTTP/1.1 Output Methods
-
/**
* Send an acknowledgment.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org