Author: markt Date: Wed Jun 17 14:44:14 2015 New Revision: 1686024 URL: http://svn.apache.org/r1686024 Log: Fix inverted logic in reading HTTP/2 input streams
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=1686024&r1=1686023&r2=1686024&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Wed Jun 17 14:44:14 2015 @@ -422,7 +422,7 @@ public class Stream extends AbstractStre // Ensure that only one thread accesses inBuffer at a time synchronized (inBuffer) { - while (inBuffer.position() == 0 && !state.isFrameTypePermitted(FrameType.DATA)) { + while (inBuffer.position() == 0 && state.isFrameTypePermitted(FrameType.DATA)) { // Need to block until some data is written try { inBuffer.wait(); @@ -437,7 +437,7 @@ public class Stream extends AbstractStre written = inBuffer.remaining(); inBuffer.get(outBuffer, 0, written); inBuffer.clear(); - } else if (state.isFrameTypePermitted(FrameType.DATA)) { + } else if (!state.isFrameTypePermitted(FrameType.DATA)) { return -1; } else { // TODO Should never happen --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org