Author: remm Date: Tue Feb 24 10:11:21 2015 New Revision: 1661879 URL: http://svn.apache.org/r1661879 Log: Use the write listener to decide between a blocking and a non blocking flush on close.
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java?rev=1661879&r1=1661878&r2=1661879&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java Tue Feb 24 10:11:21 2015 @@ -186,7 +186,7 @@ public class UpgradeServletOutputStream return; } closed = true; - flushInternal(false, false); + flushInternal((listener == null), false); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org