jetty-9: Added support for connect timeout.

1 files changed, 3 insertions, 23 deletions

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java
index c7af01e76c..53a7b87613 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java
@@ -133,7 +133,7 @@ public class ServerConnector extends AbstractNetworkConnector
         @Name("factories") ConnectionFactory... factories)
     {
         super(server,executor,scheduler,pool,acceptors,factories);
-        _manager = new ServerConnectorManager(selectors > 0 ? selectors : Runtime.getRuntime().availableProcessors());
+        _manager = new ServerConnectorManager(getExecutor(), getScheduler(), selectors > 0 ? selectors : Runtime.getRuntime().availableProcessors());
         addBean(_manager, true);
     }
 
@@ -346,32 +346,12 @@ public class ServerConnector extends AbstractNetworkConnector
 
     private final class ServerConnectorManager extends SelectorManager
     {
-        private ServerConnectorManager(int selectors)
+        private ServerConnectorManager(Executor executor, Scheduler scheduler, int selectors)
         {
-            super(selectors);
+            super(executor, scheduler, selectors);
         }
 
         @Override
-        protected void execute(Runnable task)
-        {
-            getExecutor().execute(task);
-        }
-
-        // TODO
-//        @Override
-//        public void connectionOpened(Connection connection)
-//        {
-//            ServerConnector.this.connectionOpened(connection);
-//        }
-
-        // TODO
-//        @Override
-//        public void connectionClosed(Connection connection)
-//        {
-//            ServerConnector.this.connectionClosed(connection);
-//        }
-
-        @Override
         protected SelectChannelEndPoint newEndPoint(SocketChannel channel, ManagedSelector selectSet, SelectionKey selectionKey) throws IOException
         {
             return ServerConnector.this.newEndPoint(channel, selectSet, selectionKey);