svn commit: r1136091 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpNioProcessor.java AjpProcessor.java

[markt]

Author: markt
Date: Wed Jun 15 15:46:54 2011
New Revision: 1136091

URL: http://svn.apache.org/viewvc?rev=1136091&view=rev
Log:
Align code between connectors in preparation for pulling code up to the 
superclass

Modified:
    tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1136091&r1=1136090&r2=1136091&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Wed Jun 15 
15:46:54 2011
@@ -351,18 +351,17 @@ public class AjpNioProcessor extends Abs
 
         rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
 
+        if (error) {
+            response.setStatus(500);
+        }
         if (isAsync()) {
             if (error) {
-                response.setStatus(500);
                 request.updateCounters();
                 return SocketState.CLOSED;
             } else {
                 return SocketState.LONG;
             }
         } else {
-            if (error) {
-                response.setStatus(500);
-            }
             request.updateCounters();
             return SocketState.CLOSED;
         }

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=1136091&r1=1136090&r2=1136091&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Jun 15 
15:46:54 2011
@@ -358,9 +358,11 @@ public class AjpProcessor extends Abstra
 
         rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
 
+        if (error) {
+            response.setStatus(500);
+        }
         if (isAsync()) {
             if (error) {
-                response.setStatus(500);
                 request.updateCounters();
                 input = null;
                 output = null;
@@ -369,9 +371,6 @@ public class AjpProcessor extends Abstra
                 return SocketState.LONG;
             }
         } else {
-            if (error) {
-                response.setStatus(500);
-            }
             request.updateCounters();
             input = null;
             output = null;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org