Make sure the connection always closes, no matter what

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@520176 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 e56df3f..dc71016 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1294,11 +1294,10 @@ public class NioEndpoint {
                 if (ka != null && ka.getComet()) {
                     //the comet event takes care of clean up
                     processSocket(ka.getChannel(), status, dispatch);
-                }else {
-                    if (key.isValid()) key.cancel();
-                    if (key.channel().isOpen()) key.channel().close();
-                    key.attach(null);
                 }
+                if (key.isValid()) key.cancel();
+                if (key.channel().isOpen()) key.channel().close();
+                key.attach(null);
             } catch (Throwable e) {
                 if ( log.isDebugEnabled() ) log.error("",e);
                 // Ignore