Author: markt
Date: Wed Sep 30 13:22:37 2015
New Revision: 1706022
URL: http://svn.apache.org/viewvc?rev=1706022&view=rev
Log:
Re-order action implementations to allow easier comparison between Processor
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=1706022&r1=1706021&r2=1706022&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:22:37 2015
@@ -331,17 +331,6 @@ public class AjpProcessor extends Abstra
public final void action(ActionCode actionCode, Object param) {
switch (actionCode) {
- case CLOSE: {
- // End the processing of the current request, and stop any further
- // transactions with the client
-
- try {
- finish();
- } catch (IOException e) {
- setErrorState(ErrorState.CLOSE_NOW, e);
- }
- break;
- }
case COMMIT: {
if (response.isCommitted())
return;
@@ -358,6 +347,17 @@ public class AjpProcessor extends Abstra
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_NOW, e);
}
+ break;
+ }
+ case CLOSE: {
+ // End the processing of the current request, and stop any further
+ // transactions with the client
+
+ try {
+ finish();
+ } catch (IOException e) {
+ setErrorState(ErrorState.CLOSE_NOW, e);
+ }
break;
}
case ACK: {
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=1706022&r1=1706021&r2=1706022&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:22:37 2015
@@ -653,15 +653,6 @@ public class Http11Processor extends Abs
public final void action(ActionCode actionCode, Object param) {
switch (actionCode) {
- case CLOSE: {
- // End the processing of the current request
- try {
- outputBuffer.endRequest();
- } catch (IOException e) {
- setErrorState(ErrorState.CLOSE_NOW, e);
- }
- break;
- }
case COMMIT: {
// Commit current response
if (response.isCommitted()) {
@@ -675,6 +666,15 @@ public class Http11Processor extends Abs
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_NOW, e);
}
+ break;
+ }
+ case CLOSE: {
+ // End the processing of the current request
+ try {
+ outputBuffer.endRequest();
+ } catch (IOException e) {
+ setErrorState(ErrorState.CLOSE_NOW, e);
+ }
break;
}
case ACK: {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
