Author: remm
Date: Fri Mar 21 12:30:40 2014
New Revision: 1579933
URL: http://svn.apache.org/r1579933
Log:
Add missing clear after writing the buffers (in practice this shouldn't be
needed though). If an exception occurs the response will be recycled so no need
for a finally.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java?rev=1579933&r1=1579932&r2=1579933&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
Fri Mar 21 12:30:40 2014
@@ -386,6 +386,7 @@ public class InternalNio2OutputBuffer ex
buffer.flip();
socket.getSocket().write(buffer).get(socket.getTimeout(),
TimeUnit.MILLISECONDS);
}
+ bufferedWrites.clear();
}
if (byteBuffer.hasRemaining()) {
socket.getSocket().write(byteBuffer).get(socket.getTimeout(),
TimeUnit.MILLISECONDS);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1579933&r1=1579932&r2=1579933&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 21 12:30:40 2014
@@ -45,6 +45,14 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 8.0.5 (markt)">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Fix possibly incomplete final flush with NIO2 when using non blocking
+ mode. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
