Author: markt
Date: Tue Jul 12 12:51:35 2011
New Revision: 1145571
URL: http://svn.apache.org/viewvc?rev=1145571&view=rev
Log: (empty)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
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=1145571&r1=1145570&r2=1145571&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Jul 12
12:51:35 2011
@@ -1271,6 +1271,7 @@ public class NioEndpoint extends Abstrac
log.debug("Send file connection is being closed");
}
cancelledKey(sk,SocketStatus.STOP,false);
+ return false;
}
} else if ( attachment.interestOps() == 0 && reg ) {
if (log.isDebugEnabled()) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1145571&r1=1145570&r2=1145571&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 12 12:51:35 2011
@@ -124,6 +124,10 @@
Protect against infinite loops in the HTTP NIO connector if sendfile is
configured to send more data than is available in the file. (markt)
</fix>
+ <fix>
+ Prevent NPEs when a socket is closed in non-error conditions after
+ sendfile processing when using the HTTP NIO connector. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
