418592 Make server manage the threadpool
diff --git a/jetty-setuid/jetty-setuid-java/src/main/java/org/eclipse/jetty/setuid/SetUIDListener.java b/jetty-setuid/jetty-setuid-java/src/main/java/org/eclipse/jetty/setuid/SetUIDListener.java
index 499fe3d..4a38cd7 100644
--- a/jetty-setuid/jetty-setuid-java/src/main/java/org/eclipse/jetty/setuid/SetUIDListener.java
+++ b/jetty-setuid/jetty-setuid-java/src/main/java/org/eclipse/jetty/setuid/SetUIDListener.java
@@ -181,7 +181,15 @@
{
Server server = (Server)lifecycle;
if (server.getThreadPool() instanceof LifeCycle)
- ((LifeCycle)server.getThreadPool()).start();
+ {
+ LifeCycle tplc=(LifeCycle)server.getThreadPool();
+ if (!tplc.isRunning())
+ {
+ // Start the Threadpool early, but make the server manage it
+ server.manage(tplc);
+ tplc.start();
+ }
+ }
Connector[] connectors = server.getConnectors();
if (connectors!=null)
{
@@ -192,8 +200,11 @@
((NetworkConnector)connector).open();
LOG.info("Opened " +connector);
}
- else
+ else if (!connector.isRunning())
+ {
+ server.manage(connector);
connector.start();
+ }
}
}
}
diff --git a/jetty-setuid/pom.xml b/jetty-setuid/pom.xml
index 27883a9..fce35ba 100644
--- a/jetty-setuid/pom.xml
+++ b/jetty-setuid/pom.xml
@@ -15,7 +15,7 @@
<!--
The jetty-version here only needs to be api compatiable
-->
- <jetty-version>9.0.0.M3</jetty-version>
+ <jetty-version>9.1.0.M0</jetty-version>
<jetty-test-helper-version>2.0</jetty-test-helper-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
