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 3593b37..2463f60 100644 (file)
--- 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();
     }