From b87e0f776b4264a498df46019033fe1ee28464f8 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Fri, 18 May 2012 09:48:15 +0200
Subject: [PATCH] jetty-9 commitError always completes state

---
 .../org/eclipse/jetty/server/HttpChannel.java | 36 +++++++++----------
 .../org/eclipse/jetty/server/Request.java     |  2 +-
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
index 1b221dec405..a90e488bb06 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@@ -357,7 +357,7 @@ public abstract class HttpChannel
                     LOG.warn(String.valueOf(_uri),e);
                     async_exception=e;
                     _request.setHandled(true);
-                    sendError(500, null, e.toString(), true);
+                    commitError(500, null, e.toString());
                 }
                 finally
                 {
@@ -389,11 +389,10 @@ public abstract class HttpChannel
                         _response.addHeader(HttpHeader.CONNECTION,HttpHeaderValue.CLOSE.toString());
                 }
 
-                if (!_response.isCommitted() && !_request.isHandled())
-                    sendError(HttpServletResponse.SC_NOT_FOUND,null,null,false);
-
                 try
                 {
+                    if (!_response.isCommitted() && !_request.isHandled())
+                        _response.sendError(404);
                     _response.complete();
                 }
                 catch(IOException e)
@@ -409,16 +408,17 @@ public abstract class HttpChannel
 
     
     /* ------------------------------------------------------------ */
-    protected boolean sendError(final int status, final String reason, String content, boolean close)
+    protected boolean commitError(final int status, final String reason, String content)
     {
+        LOG.debug("{} sendError {} {}",this,status,reason);
+        
         if (_response.isCommitted())
             return false;
         
         try
         {
             _response.setStatus(status,reason);
-            if (close)
-                _responseFields.add(HttpHeader.CONNECTION,HttpHeaderValue.CLOSE);
+            _responseFields.add(HttpHeader.CONNECTION,HttpHeaderValue.CLOSE);
 
             ByteBuffer buffer=null;
             if (content!=null)
@@ -436,6 +436,12 @@ public abstract class HttpChannel
         {
             LOG.debug("failed to sendError {} {}",status, reason, e);
         }
+        finally
+        {
+            if (_state.isIdle())
+                _state.complete();
+            _in.shutdownInput();
+        }
         return false;
     }
 
@@ -613,21 +619,13 @@ public abstract class HttpChannel
 
                     if (!_host)
                     {
-                        LOG.debug("!host {}",this);
-                        _responseFields.put(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE);
-                        _in.shutdownInput();
-                        sendError(HttpStatus.BAD_REQUEST_400,"No Host Header",null,true);
-                        _state.complete();
+                        commitError(HttpStatus.BAD_REQUEST_400,"No Host Header",null);
                         return true;
                     }
 
                     if (_expect)
                     {
-                        LOG.debug("!expectation {}",this);
-                        _responseFields.put(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE);
-                        _in.shutdownInput();
-                        sendError(HttpStatus.EXPECTATION_FAILED_417,null,null,true);
-                        _state.complete();
+                        commitError(HttpStatus.EXPECTATION_FAILED_417,null,null);
                         return true;
                     }
 
@@ -666,9 +664,7 @@ public abstract class HttpChannel
         @Override
         public void badMessage(String reason)
         {
-            _in.shutdownInput();
-            sendError(HttpStatus.BAD_REQUEST_400,reason,null,true);
-            _state.complete();
+            commitError(HttpStatus.BAD_REQUEST_400,reason,null);
         }
 
         @Override
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
index a14209cd4e5..c0c3dee872c 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -1056,7 +1056,7 @@ public class Request implements HttpServletRequest
                         catch (NumberFormatException e)
                         {
                             if (_channel != null)
-                                _channel.sendError(HttpStatus.BAD_REQUEST_400,"Bad Host header",null,true);
+                                _channel.commitError(HttpStatus.BAD_REQUEST_400,"Bad Host header",null);
                         }
                         return _serverName;
                 }