From 8919a6dea6ea9eae8b9a2b5b06b533dba34d6fc6 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 29 Jun 2011 11:19:55 +0000
Subject: [PATCH] If the socket is closed (i.e. due to an error) no need to
 postProcess

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1141048 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/coyote/ajp/AjpAprProtocol.java       | 2 +-
 java/org/apache/coyote/ajp/AjpNioProtocol.java       | 2 +-
 java/org/apache/coyote/ajp/AjpProtocol.java          | 2 +-
 java/org/apache/coyote/http11/Http11AprProtocol.java | 2 +-
 java/org/apache/coyote/http11/Http11NioProtocol.java | 2 +-
 java/org/apache/coyote/http11/Http11Protocol.java    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java
index 676f43aa6..ccb3e96a4 100644
--- a/java/org/apache/coyote/ajp/AjpAprProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -152,7 +152,7 @@ public class AjpAprProtocol extends AbstractAjpProtocol {
                         state = processor.process(socket);
                     }
 
-                    if (processor.isAsync()) {
+                    if (state == SocketState.CLOSED && processor.isAsync()) {
                         state = processor.asyncPostProcess();
                     }
                 } while (state == SocketState.ASYNC_END);
diff --git a/java/org/apache/coyote/ajp/AjpNioProtocol.java b/java/org/apache/coyote/ajp/AjpNioProtocol.java
index c889568a2..51d4988db 100644
--- a/java/org/apache/coyote/ajp/AjpNioProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpNioProtocol.java
@@ -190,7 +190,7 @@ public class AjpNioProtocol extends AbstractAjpProtocol {
                         state = processor.process(socket);
                     }
 
-                    if (processor.isAsync()) {
+                    if (state == SocketState.CLOSED && processor.isAsync()) {
                         state = processor.asyncPostProcess();
                     }
                 } while (state == SocketState.ASYNC_END);
diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java
index dea78cf5d..289895793 100644
--- a/java/org/apache/coyote/ajp/AjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpProtocol.java
@@ -143,7 +143,7 @@ public class AjpProtocol extends AbstractAjpProtocol {
                         state = processor.process(socket);
                     }
     
-                    if (processor.isAsync()) {
+                    if (state == SocketState.CLOSED && processor.isAsync()) {
                         state = processor.asyncPostProcess();
                     }
                 } while (state == SocketState.ASYNC_END);
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 0cbd589c6..5c7de18f2 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -237,7 +237,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol {
                         state = processor.process(socket);
                     }
 
-                    if (processor.isAsync()) {
+                    if (state != SocketState.CLOSED && processor.isAsync()) {
                         state = processor.asyncPostProcess();
                     }
                 } while (state == SocketState.ASYNC_END);
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index bfb979a6c..8550889c4 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -266,7 +266,7 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
                         state = processor.process(socket);
                     }
 
-                    if (processor.isAsync()) {
+                    if (state != SocketState.CLOSED && processor.isAsync()) {
                         state = processor.asyncPostProcess();
                     }
                 } while (state == SocketState.ASYNC_END);
diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
index 64d62e51b..2a6fd92b4 100644
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -162,7 +162,7 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol {
                         state = processor.process(socket);
                     }
     
-                    if (processor.isAsync()) {
+                    if (state != SocketState.CLOSED && processor.isAsync()) {
                         state = processor.asyncPostProcess();
                     }
                 } while (state == SocketState.ASYNC_END);
-- 
2.11.0