Author: markt Date: Fri Feb 1 10:28:30 2019 New Revision: 1852704 URL: http://svn.apache.org/viewvc?rev=1852704&view=rev Log: Align behaviour for -ve stream timeouts with documentation
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=1852704&r1=1852703&r2=1852704&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Feb 1 10:28:30 2019 @@ -222,7 +222,12 @@ class Stream extends AbstractStream impl } try { if (block) { - wait(handler.getProtocol().getStreamWriteTimeout()); + long writeTimeout = handler.getProtocol().getStreamWriteTimeout(); + if (writeTimeout < 0) { + wait(); + } else { + wait(writeTimeout); + } windowSize = getWindowSize(); if (windowSize == 0) { String msg = sm.getString("stream.writeTimeout"); @@ -978,7 +983,12 @@ class Stream extends AbstractStream impl log.debug(sm.getString("stream.inputBuffer.empty")); } - inBuffer.wait(handler.getProtocol().getStreamReadTimeout()); + long readTimeout = handler.getProtocol().getStreamReadTimeout(); + if (readTimeout < 0) { + inBuffer.wait(); + } else { + inBuffer.wait(readTimeout); + } if (resetReceived) { throw new IOException(sm.getString("stream.inputBuffer.reset")); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org