Mercurial Hosting > luan

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fc3e366caa51
children 0048a843297a
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/handler/ResourceHandler.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/server/handler/ResourceHandler.java	Tue Sep 13 23:13:06 2016 -0600
@@ -40,8 +40,8 @@
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.handler.ContextHandler.Context;
 import org.eclipse.jetty.util.URIUtil;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.eclipse.jetty.util.resource.FileResource;
 import org.eclipse.jetty.util.resource.Resource;
 
@@ -58,7 +58,7 @@
  */
 public class ResourceHandler extends HandlerWrapper
 {
-	private static final Logger LOG = Log.getLogger(ResourceHandler.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ResourceHandler.class);
 
 	ContextHandler _context;
 	Resource _baseResource;
@@ -209,7 +209,7 @@
 		catch (Exception e)
 		{
 			LOG.warn(e.toString());
-			LOG.debug(e);
+			LOG.debug("",e);
 			throw new IllegalArgumentException(resourceBase);
 		}
 	}
@@ -235,7 +235,7 @@
 				catch(IOException e)
 				{
 					LOG.warn(e.toString());
-					LOG.debug(e);
+					LOG.debug("",e);
 				}	 
 			}
 			return _defaultStylesheet;
@@ -260,7 +260,7 @@
 		catch(Exception e)
 		{
 			LOG.warn(e.toString());
-			LOG.debug(e);
+			LOG.debug("",e);
 			throw new IllegalArgumentException(stylesheet.toString());
 		}
 	}
@@ -308,7 +308,7 @@
 		}
 		catch(Exception e)
 		{
-			LOG.ignore(e);
+			LOG.trace("",e);
 		}
 
 		return null;