1 files changed, 7 insertions, 8 deletions
diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
index 789ab727c2..c769ffeeab 100644
--- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
+++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
 
 import junit.framework.Assert;
 
-import org.eclipse.jetty.io.AsyncEndPoint;
+import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.server.SelectChannelConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
@@ -59,7 +59,7 @@ public class WebSocketLoadRFC6455Test
         private final BufferedReader input;
         private final int iterations;
         private final CountDownLatch latch;
-        private/* final */AsyncEndPoint _endp;
+        private/* final */EndPoint _endp;
         private final Generator _generator;
         private final Parser _parser;
         private final IncomingFrames _handler = new IncomingFrames()
@@ -158,14 +158,13 @@ public class WebSocketLoadRFC6455Test
     @BeforeClass
     public static void startServer() throws Exception
     {
-        _server = new Server();
-
-        _connector = new SelectChannelConnector();
-        _server.addConnector(_connector);
-
         QueuedThreadPool threadPool = new QueuedThreadPool(200);
         threadPool.setMaxStopTimeMs(1000);
-        _server.setThreadPool(threadPool);
+        _server = new Server(threadPool);
+        _server.manage(threadPool);
+
+        _connector = new SelectChannelConnector(_server);
+        _server.addConnector(_connector);
 
         WebSocketHandler wsHandler = new WebSocketHandler.Simple(MyEchoSocket.class);
         wsHandler.setHandler(new DefaultHandler());