From 9fdd8d992ee7c0ae8ca703bf147dc3d6a036882d Mon Sep 17 00:00:00 2001 From: fhanik Date: Mon, 21 May 2007 09:54:46 +0000 Subject: [PATCH] add block/no block flag to flushing the SSL buffer git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@540093 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/InternalNioOutputBuffer.java | 2 +- java/org/apache/tomcat/util/net/NioChannel.java | 2 +- java/org/apache/tomcat/util/net/SecureNioChannel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java index e54d2d279..a7cbf6db5 100644 --- a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java +++ b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java @@ -433,7 +433,7 @@ public class InternalNioOutputBuffer 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); diff --git a/java/org/apache/tomcat/util/net/NioChannel.java b/java/org/apache/tomcat/util/net/NioChannel.java index ce341546e..901ef5f66 100644 --- a/java/org/apache/tomcat/util/net/NioChannel.java +++ b/java/org/apache/tomcat/util/net/NioChannel.java @@ -70,7 +70,7 @@ public class NioChannel implements ByteChannel{ * 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 } diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java b/java/org/apache/tomcat/util/net/SecureNioChannel.java index b7b691401..3593b3746 100644 --- a/java/org/apache/tomcat/util/net/SecureNioChannel.java +++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java @@ -102,7 +102,7 @@ public class SecureNioChannel extends NioChannel { * 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(); } -- 2.11.0