Author: markt
Date: Thu Jan 8 14:43:56 2015
New Revision: 1650300
URL: http://svn.apache.org/r1650300
Log:
This check only applies to non-blocking IO
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=1650300&r1=1650299&r2=1650300&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
Thu Jan 8 14:43:56 2015
@@ -131,7 +131,7 @@ public class UpgradeServletOutputStream
private void preWriteChecks() {
- if (socketWrapper.hasDataToWrite()) {
+ if (listener != null && socketWrapper.hasDataToWrite()) {
throw new
IllegalStateException(sm.getString("upgrade.sis.write.ise"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
