Author: fhanik
Date: Wed Dec 10 14:43:30 2008
New Revision: 725474
URL: http://svn.apache.org/viewvc?rev=725474&view=rev
Log:
Make sure we check if the attachment is null
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=725474&r1=725473&r2=725474&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Dec 10
14:43:30 2008
@@ -1400,8 +1400,8 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
