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 2015/02/22 19:49:52 UTC

svn commit: r1661520 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java

Author: markt
Date: Sun Feb 22 18:49:51 2015
New Revision: 1661520

URL: http://svn.apache.org/r1661520
Log:
As per EG discussion, the connection only closes after both streams have
been closed.

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1661520&r1=1661519&r2=1661520&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java Sun Feb 22 18:49:51 2015
@@ -123,7 +123,7 @@ public class UpgradeProcessor implements
             }
             return SocketState.CLOSED;
         }
-        if (upgradeServletInputStream.isClosed() ||
+        if (upgradeServletInputStream.isClosed() &&
                 upgradeServletOutputStream.isClosed()) {
             if (log.isDebugEnabled()) {
                 log.debug(sm.getString("upgradeProcessor.requiredClose",



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org