You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/06/29 13:19:55 UTC
svn commit: r1141048 - in /tomcat/trunk/java/org/apache/coyote:
ajp/AjpAprProtocol.java ajp/AjpNioProtocol.java ajp/AjpProtocol.java
http11/Http11AprProtocol.java http11/Http11NioProtocol.java
http11/Http11Protocol.java
Author: markt
Date: Wed Jun 29 11:19:55 2011
New Revision: 1141048
URL: http://svn.apache.org/viewvc?rev=1141048&view=rev
Log:
If the socket is closed (i.e. due to an error) no need to postProcess
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Jun 29 11:19:55 2011
@@ -152,7 +152,7 @@ public class AjpAprProtocol extends Abst
state = processor.process(socket);
}
- if (processor.isAsync()) {
+ if (state == SocketState.CLOSED && processor.isAsync()) {
state = processor.asyncPostProcess();
}
} while (state == SocketState.ASYNC_END);
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Wed Jun 29 11:19:55 2011
@@ -190,7 +190,7 @@ public class AjpNioProtocol extends Abst
state = processor.process(socket);
}
- if (processor.isAsync()) {
+ if (state == SocketState.CLOSED && processor.isAsync()) {
state = processor.asyncPostProcess();
}
} while (state == SocketState.ASYNC_END);
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Wed Jun 29 11:19:55 2011
@@ -143,7 +143,7 @@ public class AjpProtocol extends Abstrac
state = processor.process(socket);
}
- if (processor.isAsync()) {
+ if (state == SocketState.CLOSED && processor.isAsync()) {
state = processor.asyncPostProcess();
}
} while (state == SocketState.ASYNC_END);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Wed Jun 29 11:19:55 2011
@@ -237,7 +237,7 @@ public class Http11AprProtocol extends A
state = processor.process(socket);
}
- if (processor.isAsync()) {
+ if (state != SocketState.CLOSED && processor.isAsync()) {
state = processor.asyncPostProcess();
}
} while (state == SocketState.ASYNC_END);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Jun 29 11:19:55 2011
@@ -266,7 +266,7 @@ public class Http11NioProtocol extends A
state = processor.process(socket);
}
- if (processor.isAsync()) {
+ if (state != SocketState.CLOSED && processor.isAsync()) {
state = processor.asyncPostProcess();
}
} while (state == SocketState.ASYNC_END);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Wed Jun 29 11:19:55 2011
@@ -162,7 +162,7 @@ public class Http11Protocol extends Abst
state = processor.process(socket);
}
- if (processor.isAsync()) {
+ if (state != SocketState.CLOSED && processor.isAsync()) {
state = processor.asyncPostProcess();
}
} while (state == SocketState.ASYNC_END);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org