Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2012-08-10 09:51:27 -0400
committerSimone Bordet2012-08-10 13:02:16 -0400
commit136f7924fdcd20d7410837337f1044ba270bf8be (patch)
tree120a8e744a2c0aebb55e77c59321e3718defed33 /jetty-websocket
parent4d74adc1e576041dfee6816f93c47c5e41a99078 (diff)
downloadorg.eclipse.jetty.project-136f7924fdcd20d7410837337f1044ba270bf8be.tar.gz
org.eclipse.jetty.project-136f7924fdcd20d7410837337f1044ba270bf8be.tar.xz
org.eclipse.jetty.project-136f7924fdcd20d7410837337f1044ba270bf8be.zip
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
Diffstat (limited to 'jetty-websocket')
-rw-r--r--jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java9
1 files changed, 4 insertions, 5 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 2c26e13980..91faed5368 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
@@ -15,8 +15,6 @@
//========================================================================
package org.eclipse.jetty.websocket.server;
-import static org.junit.Assert.assertTrue;
-
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
@@ -31,7 +29,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import junit.framework.Assert;
-
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.server.SelectChannelConnector;
import org.eclipse.jetty.server.Server;
@@ -50,6 +47,8 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class WebSocketLoadRFC6455Test
{
private class WebSocketClient implements Runnable
@@ -66,7 +65,7 @@ public class WebSocketLoadRFC6455Test
{
/*
* public void close(int code,String message) { }
- *
+ *
* public void onFrame(byte flags, byte opcode, ByteBuffer buffer) { _response=buffer; }
*/
@@ -159,7 +158,7 @@ public class WebSocketLoadRFC6455Test
public static void startServer() throws Exception
{
QueuedThreadPool threadPool = new QueuedThreadPool(200);
- threadPool.setMaxStopTimeMs(1000);
+ threadPool.setStopTimeout(1000);
_server = new Server(threadPool);
_server.manage(threadPool);

Back to the top