diff src/org/eclipse/jetty/server/nio/SelectChannelConnector.java @ 887:df84a1741687

make Connector reference to server explicit
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 04 Oct 2016 23:59:56 -0600
parents 6b210bb66c63
children 1aa58272794f
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/nio/SelectChannelConnector.java	Tue Oct 04 20:27:50 2016 -0600
+++ b/src/org/eclipse/jetty/server/nio/SelectChannelConnector.java	Tue Oct 04 23:59:56 2016 -0600
@@ -36,6 +36,7 @@
 import org.eclipse.jetty.io.nio.SelectorManager.SelectSet;
 import org.eclipse.jetty.server.AsyncHttpConnection;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
 
 /* ------------------------------------------------------------------------------- */
 /**
@@ -77,8 +78,9 @@
 	 * Constructor.
 	 *
 	 */
-	public SelectChannelConnector()
+	public SelectChannelConnector(Server server,int port)
 	{
+		super(server,port);
 		_manager.setMaxIdleTime(getMaxIdleTime());
 		addBean(_manager,true);
 		setAcceptors(Math.max(1,(Runtime.getRuntime().availableProcessors()+3)/4));
@@ -173,7 +175,7 @@
 
 				// Bind the server socket to the local host and port
 				_acceptChannel.socket().setReuseAddress(getReuseAddress());
-				InetSocketAddress addr = getHost()==null?new InetSocketAddress(getPort()):new InetSocketAddress(getHost(),getPort());
+				InetSocketAddress addr = getHost()==null?new InetSocketAddress(port):new InetSocketAddress(getHost(),port);
 				_acceptChannel.socket().bind(addr,getAcceptQueueSize());
 
 				_localPort=_acceptChannel.socket().getLocalPort();
@@ -272,7 +274,7 @@
 	/* ------------------------------------------------------------------------------- */
 	protected AsyncConnection newConnection(SocketChannel channel,final AsyncEndPoint endpoint)
 	{
-		return new AsyncHttpConnection(SelectChannelConnector.this,endpoint,getServer());
+		return new AsyncHttpConnection(SelectChannelConnector.this,endpoint,server);
 	}
 
 
@@ -284,7 +286,7 @@
 		@Override
 		public void execute(Runnable task)
 		{
-			getThreadPool().execute(task);
+			server.threadPool.execute(task);
 		}
 
 		@Override