From e19178fd82db16d3f195ef934b3f1920c699543a Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Sun, 26 Oct 2014 20:34:19 +1100
Subject: [PATCH] fixed bad merge

---
 .../main/java/org/eclipse/jetty/server/HttpChannel.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 7f4afc1cea6..c1df423b02f 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
@@ -96,6 +96,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
     private final HttpChannelState _state;
     private final Request _request;
     private final Response _response;
+    private MetaData.Response _committedMetaData;
     private RequestLog _requestLog;
     
     /** Bytes written after interception (eg after compression) */
@@ -149,7 +150,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
 
     public MetaData.Response getCommittedInfo()
     {
-        return _committedInfo;
+        return _committedMetaData;
     }
 
     /**
@@ -229,6 +230,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
         _committed.set(false);
         _request.recycle();
         _response.recycle();
+        _committedMetaData=null;
         _requestLog=null;
         _written=0;
     }
@@ -526,7 +528,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
     public void onCompleted()
     {
         if (_requestLog!=null )
-            _requestLog.log(_request,_committedInfo==null?-1:_committedInfo.getStatus(), _written);   
+            _requestLog.log(_request,_committedMetaData==null?-1:_committedMetaData.getStatus(), _written);   
         _transport.completed();
     }
     
@@ -616,7 +618,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
     
     protected void commit (MetaData.Response info)
     {
-        _committedInfo=info;
+        _committedMetaData=info;
         if (LOG.isDebugEnabled())
             LOG.debug("Commit {} to {}",info,this);
     }