From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 24 Oct 2006 22:32:49 +0000 (+0000)
Subject: don't cancel, only do that within the selector thread, as this is a synchronized... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=aca815f705567fddd72291c2a0dc25c325cf9866;p=tomcat7.0

don't cancel, only do that within the selector thread, as this is a synchronized call


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@467514 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 168c5ca49..9d21f88a9 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -156,7 +156,6 @@ public class NioEndpoint {
             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;