diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
index 7b2a972b01ed..ab101829f9e0 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
@@ -47,16 +47,11 @@ public EncodingHttpWriter(HttpOutput out, String encoding)
     public void write(char[] s, int offset, int length) throws IOException
     {
         HttpOutput out = _out;
-        if (length == 0 && out.isAllContentWritten()) // TODO why is this needed?
-        {
-            out.close();
-            return;
-        }
 
         while (length > 0)
         {
             _bytes.reset();
-            int chars = length > MAX_OUTPUT_CHARS ? MAX_OUTPUT_CHARS : length;
+            int chars = Math.min(length, MAX_OUTPUT_CHARS);
 
             _converter.write(s, offset, chars);
             _converter.flush();
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 1a3e12cf6b4d..c4092d0be900 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
@@ -63,7 +63,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
     private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
     private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE);
 
-    /* TODO UPDATE!!!
+    /*
     ACTION             OPEN       ASYNC      READY      PENDING       UNREADY       CLOSING     CLOSED
     --------------------------------------------------------------------------------------------------
     setWriteListener() READY->owp ise        ise        ise           ise           ise         ise
@@ -80,7 +80,7 @@ enum State
         READY,    // isReady() has returned true
         PENDING,  // write operating in progress
         UNREADY,  // write operating in progress, isReady has returned false
-        ERROR,    // An error has occured
+        ERROR,    // onError needs to be called
         CLOSING,  // Asynchronous close in progress
         CLOSED    // Closed
     }
@@ -297,7 +297,8 @@ public void close(Callback callback)
                     return;
 
                 case ERROR:
-                    // TODO is this right?
+                    // TODO is this right? Perhaps the close should wait
+                    // TODO until after onError callback?
                     Callback cb = Callback.combine(_closeCallback, callback);
                     _closeCallback = null;
                     cb.failed(_onError);
@@ -1195,6 +1196,7 @@ public void run()
 
         synchronized (_channelState)
         {
+            // TODO does this need to be a state or just non null _onError
             if (_state == State.ERROR)
             {
                 error = _onError;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
index 545bdfa163d6..c755296ea2af 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
@@ -35,11 +35,6 @@ public Iso88591HttpWriter(HttpOutput out)
     public void write(char[] s, int offset, int length) throws IOException
     {
         HttpOutput out = _out;
-        if (length == 0 && out.isAllContentWritten()) // TODO why is this needed?
-        {
-            close();
-            return;
-        }
 
         if (length == 1)
         {
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
index d38832d4aa44..d8cc660dd65f 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
@@ -42,16 +42,11 @@ public Utf8HttpWriter(HttpOutput out)
     public void write(char[] s, int offset, int length) throws IOException
     {
         HttpOutput out = _out;
-        if (length == 0 && out.isAllContentWritten())  // TODO why is this needed?
-        {
-            close();
-            return;
-        }
 
         while (length > 0)
         {
             _bytes.reset();
-            int chars = length > MAX_OUTPUT_CHARS ? MAX_OUTPUT_CHARS : length;
+            int chars = Math.min(length, MAX_OUTPUT_CHARS);
 
             byte[] buffer = _bytes.getBuf();
             int bytes = _bytes.getCount();