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 2018/09/04 20:28:25 UTC
svn commit: r1840062 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Author: markt
Date: Tue Sep 4 20:28:25 2018
New Revision: 1840062
URL: http://svn.apache.org/viewvc?rev=1840062&view=rev
Log:
Fix failing test
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1840062&r1=1840061&r2=1840062&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Sep 4 20:28:25 2018
@@ -813,8 +813,10 @@ class Stream extends AbstractStream impl
if (streamReservation == 0) {
streamReservation = reserveWindowSize(left, block);
if (streamReservation == 0) {
- // Must be non-blocking
- buffer.compact();
+ // Must be non-blocking. Unwritten non-blocking data
+ // must put in writeBuffer else isReady() logic breaks
+ writeBuffer.add(buffer);
+ buffer.clear();
return true;
}
}
@@ -822,8 +824,10 @@ class Stream extends AbstractStream impl
int connectionReservation =
handler.reserveWindowSize(Stream.this, streamReservation, block);
if (connectionReservation == 0) {
- // Must be non-blocking
- buffer.compact();
+ // Must be non-blocking. Unwritten non-blocking data
+ // must put in writeBuffer else isReady() logic breaks
+ writeBuffer.add(buffer);
+ buffer.clear();
return true;
}
// Do the write
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org