Make sure we check if the attachment is null

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@725474 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 283abb1..08b38db 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1400,8 +1400,8 @@ public class NioEndpoint {
                 else handler.release((SocketChannel)key.channel());
                 if (key.isValid()) key.cancel();
                 if (key.channel().isOpen()) try {key.channel().close();}catch (Exception ignore){}
-                try {ka.channel.close(true);}catch (Exception ignore){}
-                ka.reset();
+                try {if (ka!=null) ka.channel.close(true);}catch (Exception ignore){}
+                if (ka!=null) ka.reset();
             } catch (Throwable e) {
                 if ( log.isDebugEnabled() ) log.error("",e);
                 // Ignore