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/18 00:16:26 UTC
svn commit: r1137052 - in /tomcat/trunk/java/org/apache/coyote:
ajp/AjpProtocol.java http11/Http11Protocol.java
Author: markt
Date: Fri Jun 17 22:16:26 2011
New Revision: 1137052
URL: http://svn.apache.org/viewvc?rev=1137052&view=rev
Log:
Connector re-factoring
Remove the need to track isAsync in the SocketWrapper
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
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=1137052&r1=1137051&r2=1137052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Fri Jun 17 22:16:26 2011
@@ -137,7 +137,7 @@ public class AjpProtocol extends Abstrac
SocketState state = SocketState.CLOSED;
do {
- if (socket.isAsync() || state == SocketState.ASYNC_END) {
+ if (processor.isAsync() || state == SocketState.ASYNC_END) {
state = processor.asyncDispatch(status);
} else {
state = processor.process(socket);
@@ -152,9 +152,7 @@ public class AjpProtocol extends Abstrac
if (state == SocketState.LONG) {
connections.put(socket, processor);
- socket.setAsync(true);
} else {
- socket.setAsync(false);
processor.recycle();
recycledProcessors.offer(processor);
}
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=1137052&r1=1137051&r2=1137052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Fri Jun 17 22:16:26 2011
@@ -156,7 +156,7 @@ public class Http11Protocol extends Abst
SocketState state = SocketState.CLOSED;
do {
- if (socket.isAsync() || state == SocketState.ASYNC_END) {
+ if (processor.isAsync() || state == SocketState.ASYNC_END) {
state = processor.asyncDispatch(status);
} else {
state = processor.process(socket);
@@ -171,9 +171,7 @@ public class Http11Protocol extends Abst
if (state == SocketState.LONG) {
connections.put(socket, processor);
- socket.setAsync(true);
} else {
- socket.setAsync(false);
processor.recycle();
recycledProcessors.offer(processor);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org