From 715340ce9224601116c19eefa4237423e8ae6520 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 15 Jun 2011 16:19:06 +0000 Subject: [PATCH] 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 --- java/org/apache/coyote/ajp/AjpNioProcessor.java | 6 +++++- java/org/apache/coyote/ajp/AjpProcessor.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpNioProcessor.java b/java/org/apache/coyote/ajp/AjpNioProcessor.java index 34c1496c5..cef0e8a4a 100644 --- 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 c9763a005..2f4127143 100644 --- 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; + } } } -- 2.11.0