fixed bad merge

1 files changed, 2 insertions, 6 deletions

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 de8e0ae0a6..ecb74dc11b 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
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritePendingException;
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.servlet.RequestDispatcher;
@@ -203,9 +204,6 @@ write completed    -          -          -          ASYNC         READY->owp
                     return;
             }
             break;
-    public void closeOutput() throws IOException
-    {
-        _channel.getResponse().closeOutput();
         }
     }
 
@@ -333,9 +331,7 @@ write completed    -          -          -          ASYNC         READY->owp
                     if (_aggregate == null)
                         _aggregate = _channel.getByteBufferPool().acquire(getBufferSize(), false);
                     BufferUtil.append(_aggregate, (byte)b);
-
-        boolean complete=_channel.getResponse().isAllContentWritten(_written);
-        
+                    
                     // Check if all written or full
                     if (complete || BufferUtil.isFull(_aggregate))
                     {