svn commit: r1661815 - in /tomcat/trunk/java/org/apache: coyote/http11/upgrade/UpgradeServletOutputStream.java tomcat/util/net/SocketWrapperBase.java

[markt]

Author: markt
Date: Mon Feb 23 22:54:13 2015
New Revision: 1661815

URL: http://svn.apache.org/r1661815
Log:
Revert flushing changes accidentally included in r1661806

Modified:
    
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.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=1661815&r1=1661814&r2=1661815&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 Mon Feb 23 22:54:13 2015
@@ -186,8 +186,7 @@ public class UpgradeServletOutputStream
             return;
         }
         closed = true;
-        socketWrapper.setWriteTimeout(socketWrapper.getConnectiontTimeout());
-        flushInternal(true, false);
+        flushInternal(false, false);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1661815&r1=1661814&r2=1661815&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Feb 
23 22:54:13 2015
@@ -199,11 +199,6 @@ public abstract class SocketWrapperBase<
     }
 
 
-    public long getConnectiontTimeout() {
-        return getEndpoint().getSoTimeout();
-    }
-
-
     public void updateLastWrite() { lastWrite = System.currentTimeMillis(); }
     public long getLastWrite() { return lastWrite; }
     public long getLastRead() { return lastRead; }



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