Author: kkolinko
Date: Thu Oct 14 08:32:59 2010
New Revision: 1022415
URL: http://svn.apache.org/viewvc?rev=1022415&view=rev
Log:
Improve recycling of processors in Http11NioProtocol
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
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=1022415&r1=1022414&r2=1022415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu Oct
14 08:32:59 2010
@@ -330,8 +330,7 @@ public class Http11NioProtocol extends A
state = processor.asyncPostProcess();
}
if (state != SocketState.LONG && state !=
SocketState.ASYNC_END) {
- connections.remove(socket);
- recycledProcessors.offer(processor);
+ release(socket);
if (state == SocketState.OPEN) {
socket.getPoller().add(socket);
}
@@ -422,6 +421,8 @@ public class Http11NioProtocol extends A
// less-than-verbose logs.
log.error(sm.getString("http11protocol.proto.error"), e);
}
+ connections.remove(socket);
+ processor.recycle();
recycledProcessors.offer(processor);
return SocketState.CLOSED;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
