From 9b36f999d1830941c5620a5dcd062b7e5e9b0ad3 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Wed, 20 Aug 2014 12:22:16 +1000
Subject: [PATCH] fixed merge

---
 .../src/main/java/org/eclipse/jetty/server/HttpChannel.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0187179ca7b..49a5817f275 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
@@ -315,7 +315,7 @@ public class HttpChannel implements Runnable
                     else
                     {
                         error=true;
-                        LOG.warn(String.valueOf(_uri), e);
+                        LOG.warn(String.valueOf(_request.getHttpURI()), e);
                         _state.error(e);
                         _request.setHandled(true);
                         handleException(e);