Author: markt
Date: Wed Sep 30 13:49:32 2015
New Revision: 1706035
URL: http://svn.apache.org/viewvc?rev=1706035&view=rev
Log:
More removal of duplicate code to commit a response.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1706035&r1=1706034&r2=1706035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Sep 30
13:49:32 2015
@@ -343,9 +343,7 @@ public class AjpProcessor extends Abstra
break;
}
case CLOSE: {
- // End the processing of the current request, and stop any further
- // transactions with the client
-
+ action(ActionCode.COMMIT, null);
try {
finish();
} catch (IOException e) {
@@ -1388,17 +1386,6 @@ public class AjpProcessor extends Abstra
* Finish AJP response.
*/
private void finish() throws IOException {
-
- if (!response.isCommitted()) {
- // Validate and write response headers
- try {
- prepareResponse();
- } catch (IOException e) {
- setErrorState(ErrorState.CLOSE_NOW, e);
- return;
- }
- }
-
if (finished)
return;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1706035&r1=1706034&r2=1706035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Wed Sep
30 13:49:32 2015
@@ -307,14 +307,6 @@ public class Http11OutputBuffer implemen
* @throws IOException an underlying I/O error occurred
*/
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;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1706035&r1=1706034&r2=1706035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Sep 30
13:49:32 2015
@@ -666,7 +666,7 @@ public class Http11Processor extends Abs
break;
}
case CLOSE: {
- // End the processing of the current request
+ action(ActionCode.COMMIT, null);
try {
outputBuffer.endRequest();
} catch (IOException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
