Author: dkulp Date: Thu Jan 5 19:39:04 2012 New Revision: 1227782 URL: http://svn.apache.org/viewvc?rev=1227782&view=rev Log: Merged revisions 1227041 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1227041 | dkulp | 2012-01-03 22:35:49 -0500 (Tue, 03 Jan 2012) | 9 lines Merged revisions 1227029 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1227029 | dkulp | 2012-01-03 21:22:00 -0500 (Tue, 03 Jan 2012) | 1 line [CXF-4007] Make sure jetty threadpool is set on the server as well. ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1227782&r1=1227781&r2=1227782&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original) +++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Thu Jan 5 19:39:04 2012 @@ -469,7 +469,11 @@ public class JettyHTTPServerEngine if (isSetThreadingParameters()) { ThreadPool pool = aconn.getThreadPool(); if (pool == null) { + pool = aconn.getServer().getThreadPool(); + } + if (pool == null) { pool = new QueuedThreadPool(); + aconn.getServer().setThreadPool(pool); aconn.setThreadPool(pool); } if (pool instanceof QueuedThreadPool) {
