You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2007/03/20 00:35:43 UTC
svn commit: r520176 -
/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: fhanik
Date: Mon Mar 19 16:35:42 2007
New Revision: 520176
URL: http://svn.apache.org/viewvc?view=rev&rev=520176
Log:
Make sure the connection always closes, no matter what
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=520176&r1=520175&r2=520176
==============================================================================
--- 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 Mon Mar 19 16:35:42 2007
@@ -1294,11 +1294,10 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org