Author: dkulp
Date: Wed Jan 4 03:35:49 2012
New Revision: 1227041
URL: http://svn.apache.org/viewvc?rev=1227041&view=rev
Log:
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.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 03:35:49 2012
@@ -1 +1 @@
-/cxf/trunk:1225217,1225494,1225521,1225538,1225563,1225876,1225880,1225895,1226521
+/cxf/trunk:1225217,1225494,1225521,1225538,1225563,1225876,1225880,1225895,1226521,1227029
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.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.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1227041&r1=1227040&r2=1227041&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Wed Jan 4 03:35:49 2012
@@ -472,7 +472,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) {
