Author: kkolinko
Date: Thu Jan 10 01:24:46 2013
New Revision: 1431171
URL: http://svn.apache.org/viewvc?rev=1431171&view=rev
Log:
Fix release of processors in AjpNioProtocol. Wrong object was used as a key in
the connections map.
"connections" is "Map<S,Processor<S>>", so the key in the map is socket, not
its wrapper.
Found this in a review inspired by a similar fix in r1426662.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
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=1431171&r1=1431170&r2=1431171&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Thu Jan 10
01:24:46 2013
@@ -146,7 +146,8 @@ public class AjpNioProtocol extends Abst
*/
@Override
public void release(SocketWrapper<NioChannel> socket) {
- Processor<NioChannel> processor = connections.remove(socket);
+ Processor<NioChannel> processor =
+ connections.remove(socket.getSocket());
if (processor != null) {
processor.recycle(true);
recycledProcessors.push(processor);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
