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 2008/04/04 21:48:36 UTC
svn commit: r644858 -
/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: fhanik
Date: Fri Apr 4 12:48:34 2008
New Revision: 644858
URL: http://svn.apache.org/viewvc?rev=644858&view=rev
Log:
fix sendfile, incorrect if else statements
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=644858&r1=644857&r2=644858&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Apr 4 12:48:34 2008
@@ -1607,10 +1607,11 @@
}
if ( sd.length <= 0 ) {
attachment.setSendfileData(null);
- if ( sd.keepAlive )
+ if ( sd.keepAlive ) {
if (reg) reg(sk,attachment,SelectionKey.OP_READ);
- else
+ } else {
cancelledKey(sk,SocketStatus.STOP,false);
+ }
} else if ( attachment.interestOps() == 0 && reg ) {
reg(sk,attachment,SelectionKey.OP_WRITE);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org