Author: fhanik
Date: Tue Oct 24 15:32:49 2006
New Revision: 467514
URL: http://svn.apache.org/viewvc?view=rev&rev=467514
Log:
don't cancel, only do that within the selector thread, as this is a
synchronized call
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?view=diff&rev=467514&r1=467513&r2=467514
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue
Oct 24 15:32:49 2006
@@ -156,7 +156,6 @@
SelectionKey key =
sel!=null?socket.getIOChannel().keyFor(sel):null;
KeyAttachment att = key!=null?(KeyAttachment)key.attachment():null;
if ( att!=null ) att.reset();
- if ( key!=null ) key.cancel();
//avoid over growing our cache or add after we have stopped
if ( running && (!paused) && (size() <
socketProperties.getDirectBufferPool()) ) return super.offer(socket);
else return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
