Mercurial Hosting > luan

diff src/org/eclipse/jetty/util/resource/Resource.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 3428c60d7cfc
children 7fb7c1915788
line wrap: on
line diff
--- a/src/org/eclipse/jetty/util/resource/Resource.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/util/resource/Resource.java	Tue Sep 13 23:13:06 2016 -0600
@@ -36,8 +36,8 @@
 import org.eclipse.jetty.util.Loader;
 import org.eclipse.jetty.util.StringUtil;
 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;
 
 
 /* ------------------------------------------------------------ */
@@ -46,7 +46,7 @@
  */
 public abstract class Resource implements ResourceFactory
 {
-    private static final Logger LOG = Log.getLogger(Resource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Resource.class);
     public static boolean __defaultUseCaches = true;
     volatile Object _associate;
 
@@ -113,7 +113,7 @@
             }
             catch(Exception e)
             {
-                LOG.debug(Log.EXCEPTION,e);
+                LOG.debug("EXCEPTION",e);
                 return new BadResource(url,e.toString());
             }
         }
@@ -178,7 +178,7 @@
                 }
                 catch(Exception e2)
                 {
-                    LOG.debug(Log.EXCEPTION,e2);
+                    LOG.debug("EXCEPTION",e2);
                     throw e;
                 }
             }
@@ -440,7 +440,7 @@
         }
         catch(Exception e)
         {
-            LOG.debug(e);
+            LOG.debug("",e);
             return null;
         }
     }