368992 avoid non-blocking flush when writing to avoid setting !_writable without _writeblocked

2 files changed, 4 insertions, 11 deletions

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
index ff95a454ed..ffbcc163e1 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
@@ -457,14 +457,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
         }
         return true;
     }
-
-    /* ------------------------------------------------------------ */
-    /* short cut for busyselectChannelServerTest */
-    public void clearWritable()
-    {
-        _writable=false;
-    }
-
+    
     /* ------------------------------------------------------------ */
     /**
      * @see org.eclipse.jetty.io.AsyncEndPoint#scheduleWrite()
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
index 7f5d2628b4..12bf46b6d7 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
@@ -135,8 +135,8 @@ public class HttpOutput extends ServletOutputStream
 
         // Add the _content
         if (_generator.addContent((byte)b))
-            // Buffers are full so flush.
-            flush();
+            // Buffers are full so commit.
+            _connection.commitResponse(Generator.MORE);
        
         if (_generator.isAllContentWritten())
         {
@@ -174,7 +174,7 @@ public class HttpOutput extends ServletOutputStream
             close();
         } 
         else if (_generator.isBufferFull())
-            flush();
+            _connection.commitResponse(Generator.MORE);
 
         // Block until our buffer is free
         while (buffer.length() > 0 && _generator.isOpen())