You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/14 10:09:53 UTC
svn commit: r1774161 - in /tomcat/trunk:
java/org/apache/coyote/http11/Http11InputBuffer.java
webapps/docs/changelog.xml
Author: markt
Date: Wed Dec 14 10:09:53 2016
New Revision: 1774161
URL: http://svn.apache.org/viewvc?rev=1774161&view=rev
Log:
Fix intermittent test failure spotted during some refactoring.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1774161&r1=1774160&r2=1774161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Wed Dec 14 10:09:53 2016
@@ -284,6 +284,7 @@ public class Http11InputBuffer implement
// Copy leftover bytes to the beginning of the buffer
if (byteBuffer.remaining() > 0 && byteBuffer.position() > 0) {
byteBuffer.compact();
+ byteBuffer.flip();
}
// Always reset pos to zero
byteBuffer.limit(byteBuffer.limit() - byteBuffer.position()).position(0);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1774161&r1=1774160&r2=1774161&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Dec 14 10:09:53 2016
@@ -87,6 +87,11 @@
when configured with an address of <code>0.0.0.0</code> or
<code>::</code>. (markt)
</fix>
+ <fix>
+ Correct a regression in the refactoring to make wider use of
+ <code>ByteBuffer</code> that caused an intermittent failure in the unit
+ tests. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web Applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org