diff src/org/eclipse/jetty/server/Request.java @ 820:8e9db0bbf4f9

remove org.eclipse.jetty.util.log and upgrade slf4j
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 13 Sep 2016 23:13:06 -0600
parents 07c82fabc46b
children 0048a843297a
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/Request.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/server/Request.java	Tue Sep 13 23:13:06 2016 -0600
@@ -90,8 +90,8 @@
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.UrlEncoded;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /* ------------------------------------------------------------ */
 /**
@@ -127,7 +127,7 @@
 	public static final String __MULTIPART_CONFIG_ELEMENT = "org.eclipse.multipartConfig";
 	public static final String __MULTIPART_INPUT_STREAM = "org.eclipse.multiPartInputStream";
 	public static final String __MULTIPART_CONTEXT = "org.eclipse.multiPartContext";
-	private static final Logger LOG = Log.getLogger(Request.class);
+	private static final Logger LOG = LoggerFactory.getLogger(Request.class);
 
 	private static final String __ASYNC_FWD = "org.eclipse.asyncfwd";
 	private static final Collection __defaultLocale = Collections.singleton(Locale.getDefault());
@@ -274,7 +274,7 @@
 					catch (UnsupportedEncodingException e)
 					{
 						if (LOG.isDebugEnabled())
-							LOG.warn(e);
+							LOG.warn("",e);
 						else
 							LOG.warn(e.toString());
 					}
@@ -349,7 +349,7 @@
 						catch (IOException e)
 						{
 							if (LOG.isDebugEnabled())
-								LOG.warn(e);
+								LOG.warn("",e);
 							else
 								LOG.warn(e.toString());
 						}
@@ -383,14 +383,14 @@
 				catch (IOException e)
 				{
 					if (LOG.isDebugEnabled())
-						LOG.warn(e);
+						LOG.warn("",e);
 					else
 						LOG.warn(e.toString());
 				}
 				catch (ServletException e)
 				{
 					if (LOG.isDebugEnabled())
-						LOG.warn(e);
+						LOG.warn("",e);
 					else
 						LOG.warn(e.toString());
 				}
@@ -1146,7 +1146,7 @@
 		}
 		catch (java.net.UnknownHostException e)
 		{
-			LOG.ignore(e);
+			LOG.trace("",e);
 		}
 		return _serverName;
 	}
@@ -1365,7 +1365,7 @@
 			}
 			catch (Exception e)
 			{
-				LOG.ignore(e);
+				LOG.trace("",e);
 				_reader = null;
 			}
 		}