svn commit: r540093 - in /tomcat/tc6.0.x/trunk/java/org/apache: coyote/http11/InternalNioOutputBuffer.java tomcat/util/net/NioChannel.java tomcat/util/net/SecureNioChannel.java

[fhanik]

Author: fhanik
Date: Mon May 21 02:54:46 2007
New Revision: 540093

URL: http://svn.apache.org/viewvc?view=rev&rev=540093
Log:
add block/no block flag to flushing the SSL buffer

Modified:
    
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?view=diff&rev=540093&r1=540092&r2=540093
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 
Mon May 21 02:54:46 2007
@@ -433,7 +433,7 @@
             written = getSelectorPool().write(bytebuffer, socket, selector, 
writeTimeout);
             //make sure we are flushed 
             do {
-                if (socket.flush(selector)) break;
+                if (socket.flush(true,selector,writeTimeout)) break;
             }while ( true );
         }finally { 
             if ( selector != null ) getSelectorPool().put(selector);

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java?view=diff&rev=540093&r1=540092&r2=540093
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java Mon 
May 21 02:54:46 2007
@@ -70,7 +70,7 @@
      * been flushed out and is empty
      * @return boolean
      */
-    public boolean flush(Selector s) throws IOException {
+    public boolean flush(boolean block, Selector s,long timeout) throws 
IOException {
         return true; //no network buffer in the regular channel
     }
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?view=diff&rev=540093&r1=540092&r2=540093
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
Mon May 21 02:54:46 2007
@@ -102,7 +102,7 @@
      * been flushed out and is empty
      * @return boolean
      */
-    public boolean flush(Selector s, long timeout) throws IOException {
+    public boolean flush(boolean block, Selector s, long timeout) throws 
IOException {
         pool.write(netOutBuffer,this,s,timeout);
         return !netOutBuffer.hasRemaining();
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]