Mercurial Hosting > luan

diff src/org/eclipse/jetty/util/resource/FileResource.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
line wrap: on
line diff
--- a/src/org/eclipse/jetty/util/resource/FileResource.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/util/resource/FileResource.java	Tue Sep 13 23:13:06 2016 -0600
@@ -33,8 +33,8 @@
 
 import org.eclipse.jetty.util.IO;
 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;
 
 
 /* ------------------------------------------------------------ */
@@ -48,7 +48,7 @@
  */
 public class FileResource extends URLResource
 {
-    private static final Logger LOG = Log.getLogger(FileResource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FileResource.class);
     private static boolean __checkAliases = true;
 
     /* ------------------------------------------------------------ */
@@ -91,7 +91,7 @@
         }
         catch (Exception e)
         {
-            LOG.ignore(e);
+            LOG.trace("",e);
             try
             {
                 // Assume that File.toURL produced unencoded chars. So try
@@ -105,7 +105,7 @@
             }
             catch (Exception e2)
             {
-                LOG.ignore(e2);
+                LOG.trace("",e2);
 
                 // Still can't get the file.  Doh! try good old hack!
                 checkConnection();
@@ -207,7 +207,7 @@
             }
             catch(Exception e)
             {
-                LOG.warn(Log.EXCEPTION,e);
+                LOG.warn("EXCEPTION",e);
                 return getURL();
             }                
         }