Align code between connectors in preparation for pulling code up to the superclass

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1136091 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/ajp/AjpNioProcessor.java b/java/org/apache/coyote/ajp/AjpNioProcessor.java
index 4027d91..34c1496 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpNioProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpNioProcessor.java
@@ -351,18 +351,17 @@ public class AjpNioProcessor extends AbstractAjpProcessor {
 
         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;
         }

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java
index 1800929..777ea58 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -358,9 +358,11 @@ public class AjpProcessor extends AbstractAjpProcessor {
 
         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 AbstractAjpProcessor {
                 return SocketState.LONG;
             }
         } else {
-            if (error) {
-                response.setStatus(500);
-            }
             request.updateCounters();
             input = null;
             output = null;