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

No need to close the AJP connection if there was no error

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

diff --git a/java/org/apache/coyote/ajp/AjpNioProcessor.java b/java/org/apache/coyote/ajp/AjpNioProcessor.java
index 34c1496..cef0e8a 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpNioProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpNioProcessor.java
@@ -363,7 +363,11 @@ public class AjpNioProcessor extends AbstractAjpProcessor {
             }
         } else {
             request.updateCounters();
-            return SocketState.CLOSED;
+            if (error) {
+                return SocketState.CLOSED;
+            } else {
+                return SocketState.OPEN;
+            }
         }
 
 

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java
index c9763a0..2f41271 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -370,7 +370,11 @@ public class AjpProcessor extends AbstractAjpProcessor {
             }
         } else {
             request.updateCounters();
-            return SocketState.CLOSED;
+            if (error) {
+                return SocketState.CLOSED;
+            } else {
+                return SocketState.OPEN;
+            }
         }
     }