Author: markt
Date: Wed Sep 30 13:32:19 2015
New Revision: 1706030
URL: http://svn.apache.org/viewvc?rev=1706030&view=rev
Log:
Small steps towards aligning action() implementations.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.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=1706030&r1=1706029&r2=1706030&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:32:19 2015
@@ -332,16 +332,14 @@ public class AjpProcessor extends Abstra
switch (actionCode) {
case COMMIT: {
- if (response.isCommitted())
- return;
-
- try {
- // Validate and write response headers
- prepareResponse();
- } catch (IOException e) {
- setErrorState(ErrorState.CLOSE_NOW, e);
+ if (!response.isCommitted()) {
+ try {
+ // Validate and write response headers
+ prepareResponse();
+ } catch (IOException e) {
+ setErrorState(ErrorState.CLOSE_NOW, e);
+ }
}
-
break;
}
case CLOSE: {
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=1706030&r1=1706029&r2=1706030&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:32:19 2015
@@ -655,16 +655,14 @@ public class Http11Processor extends Abs
switch (actionCode) {
case COMMIT: {
// Commit current response
- if (response.isCommitted()) {
- return;
- }
-
- // Validate and write response headers
- try {
- prepareResponse();
- outputBuffer.commit();
- } catch (IOException e) {
- setErrorState(ErrorState.CLOSE_NOW, e);
+ if (!response.isCommitted()) {
+ // Validate and write response headers
+ try {
+ prepareResponse();
+ outputBuffer.commit();
+ } catch (IOException e) {
+ setErrorState(ErrorState.CLOSE_NOW, e);
+ }
}
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
