You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/10/06 18:20:46 UTC
svn commit: r1179690 - in /cxf/branches/2.4.x-fixes: ./
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
Author: dkulp
Date: Thu Oct 6 16:20:46 2011
New Revision: 1179690
URL: http://svn.apache.org/viewvc?rev=1179690&view=rev
Log:
Merged revisions 1179686 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1179686 | dkulp | 2011-10-06 12:14:51 -0400 (Thu, 06 Oct 2011) | 1 line
Avoid potential NPE if optional attributes aren't specified
........
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/spring/JettyHTTPServerEngineBeanDefinitionParser.java
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
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/spring/JettyHTTPServerEngineBeanDefinitionParser.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/spring/JettyHTTPServerEngineBeanDefinitionParser.java?rev=1179690&r1=1179689&r2=1179690&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java Thu Oct 6 16:20:46 2011
@@ -137,8 +137,12 @@ public class JettyHTTPServerEngineBeanDe
private static ThreadingParameters toThreadingParameters(
ThreadingParametersType paramtype) {
ThreadingParameters params = new ThreadingParameters();
- params.setMaxThreads(paramtype.getMaxThreads());
- params.setMinThreads(paramtype.getMinThreads());
+ if (paramtype.getMaxThreads() != null) {
+ params.setMaxThreads(paramtype.getMaxThreads());
+ }
+ if (paramtype.getMinThreads() != null) {
+ params.setMinThreads(paramtype.getMinThreads());
+ }
return params;
}