Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Jetty9 - Removed duplicate logger definitions.

This commit is contained in:
Simone Bordet 2012-08-13 11:48:32 +02:00
parent 360bdfa051
commit 279f24faaa
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-server/src/main/java/org/eclipse/jetty/server/SelectChannelConnector.java
View File

@ -32,8 +32,6 @@ import org.eclipse.jetty.io.SelectChannelEndPoint;
import org.eclipse.jetty.io.SelectorManager; import org.eclipse.jetty.io.SelectorManager;
import org.eclipse.jetty.io.SelectorManager.ManagedSelector; import org.eclipse.jetty.io.SelectorManager.ManagedSelector;
import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.annotation.Name;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
/** /**
@ -41,8 +39,6 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
*/ */
public class SelectChannelConnector extends AbstractNetworkConnector public class SelectChannelConnector extends AbstractNetworkConnector
{ {
public static final Logger LOG = Log.getLogger(SelectChannelConnector.class);
private final SelectorManager _manager; private final SelectorManager _manager;
private volatile ServerSocketChannel _acceptChannel; private volatile ServerSocketChannel _acceptChannel;
private volatile boolean _inheritChannel = false; private volatile boolean _inheritChannel = false;
@ -95,7 +91,7 @@ public class SelectChannelConnector extends AbstractNetworkConnector
ServerSocketChannel channel = _acceptChannel; ServerSocketChannel channel = _acceptChannel;
return channel!=null && channel.isOpen(); return channel!=null && channel.isOpen();
} }
/** /**
* @return whether this connector uses a channel inherited from the JVM. * @return whether this connector uses a channel inherited from the JVM.
* @see System#inheritedChannel() * @see System#inheritedChannel()
@ -163,12 +159,12 @@ public class SelectChannelConnector extends AbstractNetworkConnector
{ {
ServerSocketChannel serverChannel = _acceptChannel; ServerSocketChannel serverChannel = _acceptChannel;
_acceptChannel = null; _acceptChannel = null;
if (serverChannel != null) if (serverChannel != null)
{ {
removeBean(serverChannel); removeBean(serverChannel);
// If the interrupt did not close it, we should close it // If the interrupt did not close it, we should close it
if (serverChannel.isOpen()) if (serverChannel.isOpen())
{ {

8
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java
View File

@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngine;
import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.Connection;
@ -29,21 +28,16 @@ import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.ssl.SslConnection; import org.eclipse.jetty.io.ssl.SslConnection;
import org.eclipse.jetty.npn.NextProtoNego; import org.eclipse.jetty.npn.NextProtoNego;
import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.SelectChannelConnector; import org.eclipse.jetty.server.SelectChannelConnector;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.spdy.api.SPDY; import org.eclipse.jetty.spdy.api.SPDY;
import org.eclipse.jetty.spdy.api.Session; import org.eclipse.jetty.spdy.api.Session;
import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener; import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener;
import org.eclipse.jetty.util.component.AggregateLifeCycle; import org.eclipse.jetty.util.component.AggregateLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
public class SPDYServerConnector extends SelectChannelConnector public class SPDYServerConnector extends SelectChannelConnector
{ {
private static final Logger LOG = Log.getLogger(SPDYServerConnector.class);
private final Queue<Session> sessions = new ConcurrentLinkedQueue<>(); private final Queue<Session> sessions = new ConcurrentLinkedQueue<>();
private final ServerSessionFrameListener listener; private final ServerSessionFrameListener listener;
private volatile int initialWindowSize; private volatile int initialWindowSize;