comparison src/org/eclipse/jetty/io/nio/ChannelEndPoint.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 220ad4853cda
comparison
equal deleted inserted replaced
819:17bd0b170ed6 820:8e9db0bbf4f9
29 import java.nio.channels.SocketChannel; 29 import java.nio.channels.SocketChannel;
30 30
31 import org.eclipse.jetty.io.Buffer; 31 import org.eclipse.jetty.io.Buffer;
32 import org.eclipse.jetty.io.EndPoint; 32 import org.eclipse.jetty.io.EndPoint;
33 import org.eclipse.jetty.util.StringUtil; 33 import org.eclipse.jetty.util.StringUtil;
34 import org.eclipse.jetty.util.log.Log; 34 import org.slf4j.Logger;
35 import org.eclipse.jetty.util.log.Logger; 35 import org.slf4j.LoggerFactory;
36 36
37 /** 37 /**
38 * Channel End Point. 38 * Channel End Point.
39 * <p>Holds the channel and socket for an NIO endpoint. 39 * <p>Holds the channel and socket for an NIO endpoint.
40 * 40 *
41 */ 41 */
42 public class ChannelEndPoint implements EndPoint 42 public class ChannelEndPoint implements EndPoint
43 { 43 {
44 private static final Logger LOG = Log.getLogger(ChannelEndPoint.class); 44 private static final Logger LOG = LoggerFactory.getLogger(ChannelEndPoint.class);
45 45
46 protected final ByteChannel _channel; 46 protected final ByteChannel _channel;
47 protected final ByteBuffer[] _gather2=new ByteBuffer[2]; 47 protected final ByteBuffer[] _gather2=new ByteBuffer[2];
48 protected final Socket _socket; 48 protected final Socket _socket;
49 protected final InetSocketAddress _local; 49 protected final InetSocketAddress _local;
129 } 129 }
130 } 130 }
131 catch (SocketException e) 131 catch (SocketException e)
132 { 132 {
133 LOG.debug(e.toString()); 133 LOG.debug(e.toString());
134 LOG.ignore(e); 134 LOG.trace("",e);
135 } 135 }
136 finally 136 finally
137 { 137 {
138 if (_oshut) 138 if (_oshut)
139 { 139 {
168 } 168 }
169 } 169 }
170 catch (SocketException e) 170 catch (SocketException e)
171 { 171 {
172 LOG.debug(e.toString()); 172 LOG.debug(e.toString());
173 LOG.ignore(e); 173 LOG.trace("",e);
174 } 174 }
175 finally 175 finally
176 { 176 {
177 if (_ishut) 177 if (_ishut)
178 { 178 {
257 if (_channel.isOpen()) 257 if (_channel.isOpen())
258 _channel.close(); 258 _channel.close();
259 } 259 }
260 catch (Exception xx) 260 catch (Exception xx)
261 { 261 {
262 LOG.ignore(xx); 262 LOG.trace("",xx);
263 } 263 }
264 264
265 if (len>0) 265 if (len>0)
266 throw x; 266 throw x;
267 len=-1; 267 len=-1;