From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 21 May 2007 09:56:48 +0000 (+0000)
Subject: add non block support
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0bba4b4395551dbaf8756026b1826cafab0cfe6a;p=tomcat7.0

add non block support


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@540094 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 3593b3746..2463f60f2 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -103,7 +103,11 @@ public class SecureNioChannel extends NioChannel  {
      * @return boolean
      */
     public boolean flush(boolean block, Selector s, long timeout) throws IOException {
-        pool.write(netOutBuffer,this,s,timeout);
+        if (!block) {
+            flush(netOutBuffer);
+        } else {
+            pool.write(netOutBuffer, this, s, timeout);
+        }
         return !netOutBuffer.hasRemaining();
     }