[jetty-commit] r849 - in jetty/branches/jetty-7.0.0.x: . jetty-server/sr

[genie@xxxxxxxxxxx]

Author: sbordet
Date: 2009-09-09 08:53:23 -0400 (Wed, 09 Sep 2009)
New Revision: 849

Modified:
   jetty/branches/jetty-7.0.0.x/VERSION.txt
   jetty/branches/jetty-7.0.0.x/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
Log:
Fix for bug #283357: org.eclipse.jetty.server.HttpConnectionTest exceptions.

Modified: jetty/branches/jetty-7.0.0.x/VERSION.txt
===================================================================
--- jetty/branches/jetty-7.0.0.x/VERSION.txt	2009-09-09 12:43:06 UTC (rev 848)
+++ jetty/branches/jetty-7.0.0.x/VERSION.txt	2009-09-09 12:53:23 UTC (rev 849)
@@ -14,6 +14,7 @@
  + 288466 LocalConnector is not thread safe
  + 288772 Failure to connect does not set status to EXCEPTED
  + 280723 Add non blocking statistics handler
+ + 283357 org.eclipse.jetty.server.HttpConnectionTest exceptions
 
 jetty-6.1.20 27 August 2009
  + JETTY-838 Don't log and throw

Modified: jetty/branches/jetty-7.0.0.x/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
===================================================================
--- jetty/branches/jetty-7.0.0.x/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java	2009-09-09 12:43:06 UTC (rev 848)
+++ jetty/branches/jetty-7.0.0.x/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java	2009-09-09 12:53:23 UTC (rev 849)
@@ -16,7 +16,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
-
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -40,12 +39,12 @@
 import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.http.Parser;
 import org.eclipse.jetty.io.Buffer;
+import org.eclipse.jetty.io.BufferCache.CachedBuffer;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.EofException;
 import org.eclipse.jetty.io.RuntimeIOException;
 import org.eclipse.jetty.io.UncheckedPrintWriter;
-import org.eclipse.jetty.io.BufferCache.CachedBuffer;
 import org.eclipse.jetty.io.nio.SelectChannelEndPoint;
 import org.eclipse.jetty.util.QuotedStringTokenizer;
 import org.eclipse.jetty.util.StringUtil;
@@ -580,13 +579,13 @@
                     error=true;
                     if (info==null)
                     {
-                        Log.warn(_uri+": "+e);
+                        Log.debug(_uri+": "+e);
                         _request.setHandled(true);
                         _generator.sendError(400, null, null, true);
                     }
                     else
                     {
-                        Log.warn(""+_uri,e);
+                        Log.debug(""+_uri,e);
                         _request.setHandled(true);
                         _generator.sendError(500, null, null, true);
                     }
@@ -813,7 +812,6 @@
             }
             catch (Exception e)
             {
-                Log.warn(method+" "+uri+" "+version+": "+e);
                 Log.debug(e);
                 throw new HttpException(HttpStatus.BAD_REQUEST_400,null,e);
             }