diff src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.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 3428c60d7cfc
children 6b210bb66c63
line wrap: on
line diff
--- a/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java	Tue Sep 13 23:13:06 2016 -0600
@@ -32,8 +32,8 @@
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EofException;
 import org.eclipse.jetty.io.nio.SelectorManager.SelectSet;
-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.thread.Timeout.Task;
 
 /* ------------------------------------------------------------ */
@@ -42,7 +42,7 @@
  */
 public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPoint, ConnectedEndPoint
 {
-    public static final Logger LOG=Log.getLogger("org.eclipse.jetty.io.nio");
+    public static final Logger LOG=LoggerFactory.getLogger("org.eclipse.jetty.io.nio");
 
     private final boolean WORK_AROUND_JVM_BUG_6346658 = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("win");
     private final SelectorManager.SelectSet _selectSet;
@@ -450,7 +450,7 @@
                     }
                     catch (final InterruptedException e)
                     {
-                        LOG.warn(e);
+                        LOG.warn("",e);
                         if (_interruptable)
                             throw new InterruptedIOException(){{this.initCause(e);}};
                     }
@@ -500,7 +500,7 @@
                     }
                     catch (final InterruptedException e)
                     {
-                        LOG.warn(e);
+                        LOG.warn("",e);
                         if (_interruptable)
                             throw new InterruptedIOException(){{this.initCause(e);}};
                     }
@@ -595,7 +595,7 @@
                 catch(Exception e)
                 {
                     _key=null;
-                    LOG.ignore(e);
+                    LOG.trace("",e);
                 }
             }
             changed=_interestOps!=current_ops;
@@ -636,7 +636,7 @@
                             }
                             catch (Exception e)
                             {
-                                LOG.ignore(e);
+                                LOG.trace("",e);
                                 if (_key!=null && _key.isValid())
                                 {
                                     _key.cancel();
@@ -707,25 +707,25 @@
                 }
                 catch (ClosedChannelException e)
                 {
-                    LOG.ignore(e);
+                    LOG.trace("",e);
                 }
                 catch (EofException e)
                 {
                     LOG.debug("EOF", e);
                     try{close();}
-                    catch(IOException e2){LOG.ignore(e2);}
+                    catch(IOException e2){LOG.trace("",e2);}
                 }
                 catch (IOException e)
                 {
                     LOG.warn(e.toString());
                     try{close();}
-                    catch(IOException e2){LOG.ignore(e2);}
+                    catch(IOException e2){LOG.trace("",e2);}
                 }
                 catch (Throwable e)
                 {
                     LOG.warn("handle failed", e);
                     try{close();}
-                    catch(IOException e2){LOG.ignore(e2);}
+                    catch(IOException e2){LOG.trace("",e2);}
                 }
                 finally
                 {
@@ -740,7 +740,7 @@
                         {
                             LOG.warn("onInputShutdown failed", x);
                             try{close();}
-                            catch(IOException e2){LOG.ignore(e2);}
+                            catch(IOException e2){LOG.trace("",e2);}
                         }
                         finally
                         {
@@ -787,7 +787,7 @@
             }
             catch (Throwable e)
             {
-                LOG.ignore(e);
+                LOG.trace("",e);
             }
         }
 
@@ -797,7 +797,7 @@
         }
         catch (IOException e)
         {
-            LOG.ignore(e);
+            LOG.trace("",e);
         }
         finally
         {