From 962a0d08895274d2701c5ffd8a4776706064d8d2 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 3 Aug 2012 08:44:49 +1000 Subject: [PATCH] jetty-9 ensure injected threadpool is managed --- .../java/org/eclipse/jetty/embedded/LikeJettyXml.java | 1 + .../java/org/eclipse/jetty/server/StressTest.java | 1 + .../jetty/util/component/AggregateLifeCycle.java | 11 +++++++++++ .../websocket/server/WebSocketLoadRFC6455Test.java | 1 + .../src/test/java/org/eclipse/jetty/TestServer.java | 1 + 5 files changed, 15 insertions(+) diff --git a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java index 294b2353201..f5897a5ff8f 100644 --- a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java +++ b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java @@ -46,6 +46,7 @@ public class LikeJettyXml threadPool.setMaxThreads(500); Server server = new Server(threadPool); + server.manage(threadPool); server.setDumpAfterStart(true); server.setDumpBeforeStop(true); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java index de79f21b895..62daeb4e4bc 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java @@ -86,6 +86,7 @@ public class StressTest _threads.setMaxThreads(200); _server = new Server(_threads); + _server.manage(_threads); _connector = new SelectChannelConnector(_server,null,null,null,null,1,1); _connector.setAcceptQueueSize(5000); _connector.setIdleTimeout(30000); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java index ece9eb3a778..b5d0053fb01 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java @@ -68,6 +68,17 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable { for (Bean b:_beans) { + if (b._bean instanceof LifeCycle) + { + LifeCycle l=(LifeCycle)b._bean; + if (!l.isRunning()) + { + if (b._managed) + l.start(); + else + LOG.warn("!managed !started {}",b); + } + } if (b._managed && b._bean instanceof LifeCycle) { LifeCycle l=(LifeCycle)b._bean; 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 bc9ce75167d..c769ffeeabd 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 @@ -161,6 +161,7 @@ public class WebSocketLoadRFC6455Test QueuedThreadPool threadPool = new QueuedThreadPool(200); threadPool.setMaxStopTimeMs(1000); _server = new Server(threadPool); + _server.manage(threadPool); _connector = new SelectChannelConnector(_server); _server.addConnector(_connector); diff --git a/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java b/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java index fc7211f1104..1446dce8b11 100644 --- a/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java +++ b/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java @@ -62,6 +62,7 @@ public class TestServer // Setup server Server server = new Server(threadPool); + server.manage(threadPool); server.setSendDateHeader(true); // Setup JMX