Make the jettyMaxThreads parameter actually be effective

zch · andreastt · commit b17f30b5b841 · 2014-08-08T13:13:21.000+02:00
Calling server.start() before setting a new thread pool caused the new thread pool to be ignored. Moved the call to server.start() to after the thread pool has been configured, which now makes the server use the newly configured thread pool instead of the default one. Fixes "Selenium grid Jetty server thread count cannot be configured by parameter jettyMaxThreads": https://code.google.com/p/selenium/issues/detail?id=7240 Signed-off-by: Andreas Tolfsen <ato@mozilla.com>
diff --git a/java/server/src/org/openqa/grid/web/Hub.java b/java/server/src/org/openqa/grid/web/Hub.java
@@ -164,12 +164,12 @@ public String getHost() {
 
   public void start() throws Exception {
     initServer();
-    server.start();
     if (maxThread>0){
       QueuedThreadPool pool = new QueuedThreadPool();
       pool.setMaxThreads(maxThread);
       server.setThreadPool(pool);
     }
+    server.start();
   }
 
   public void stop() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,12 @@ public String getHost() {`
`164`	`164`
`165`	`165`	`public void start() throws Exception {`
`166`	`166`	`initServer();`
`167`		`- server.start();`
`168`	`167`	`if (maxThread>0){`
`169`	`168`	`QueuedThreadPool pool = new QueuedThreadPool();`
`170`	`169`	`pool.setMaxThreads(maxThread);`
`171`	`170`	`server.setThreadPool(pool);`
`172`	`171`	`}`
	`172`	`+ server.start();`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`public void stop() throws Exception {`