You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2019/01/30 01:37:46 UTC
[cxf] branch 3.2.x-fixes updated: [CXF-7956]add NPE guard for jetty
and undertow threads configuration in blueprint
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 40c4fd6 [CXF-7956]add NPE guard for jetty and undertow threads configuration in blueprint
40c4fd6 is described below
commit 40c4fd6d3e9e1040488a3f7266c83ffa55abcdc4
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Wed Jan 30 09:35:32 2019 +0800
[CXF-7956]add NPE guard for jetty and undertow threads configuration in blueprint
(cherry picked from commit 6e70d53a7b256c866efe9a5ec863cb998b0b9e58)
---
.../blueprint/JettyHTTPServerEngineFactoryHolder.java | 16 ++++++++++++----
.../blueprint/UndertowHTTPServerEngineFactoryHolder.java | 16 ++++++++++++----
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
index 98fe722..819687f 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
@@ -89,8 +89,12 @@ public class JettyHTTPServerEngineFactoryHolder {
for (ThreadingParametersIdentifiedType threads : config.getIdentifiedThreadingParameters()) {
ThreadingParameters rThreads = new ThreadingParameters();
String id = threads.getId();
- rThreads.setMaxThreads(threads.getThreadingParameters().getMaxThreads());
- rThreads.setMinThreads(threads.getThreadingParameters().getMinThreads());
+ if (threads.getThreadingParameters().getMaxThreads() != null) {
+ rThreads.setMaxThreads(threads.getThreadingParameters().getMaxThreads());
+ }
+ if (threads.getThreadingParameters().getMinThreads() != null) {
+ rThreads.setMinThreads(threads.getThreadingParameters().getMinThreads());
+ }
rThreads.setThreadNamePrefix(threads.getThreadingParameters().getThreadNamePrefix());
threadingParametersMap.put(id, rThreads);
}
@@ -164,8 +168,12 @@ public class JettyHTTPServerEngineFactoryHolder {
if (engine.getThreadingParameters() != null) {
ThreadingParametersType threads = engine.getThreadingParameters();
ThreadingParameters rThreads = new ThreadingParameters();
- rThreads.setMaxThreads(threads.getMaxThreads());
- rThreads.setMinThreads(threads.getMinThreads());
+ if (threads.getMaxThreads() != null) {
+ rThreads.setMaxThreads(threads.getMaxThreads());
+ }
+ if (threads.getMinThreads() != null) {
+ rThreads.setMinThreads(threads.getMinThreads());
+ }
eng.setThreadingParameters(rThreads);
}
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
index 0a2bfcf..7131a0a 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
@@ -85,8 +85,12 @@ public class UndertowHTTPServerEngineFactoryHolder {
for (ThreadingParametersIdentifiedType threads : config.getIdentifiedThreadingParameters()) {
ThreadingParameters rThreads = new ThreadingParameters();
String id = threads.getId();
- rThreads.setMaxThreads(threads.getThreadingParameters().getMaxThreads());
- rThreads.setMinThreads(threads.getThreadingParameters().getMinThreads());
+ if (threads.getThreadingParameters().getMaxThreads() != null) {
+ rThreads.setMaxThreads(threads.getThreadingParameters().getMaxThreads());
+ }
+ if (threads.getThreadingParameters().getMinThreads() != null) {
+ rThreads.setMinThreads(threads.getThreadingParameters().getMinThreads());
+ }
rThreads.setWorkerIOThreads(threads.getThreadingParameters().getWorkerIOThreads());
threadingParametersMap.put(id, rThreads);
}
@@ -143,8 +147,12 @@ public class UndertowHTTPServerEngineFactoryHolder {
if (engine.getThreadingParameters() != null) {
ThreadingParametersType threads = engine.getThreadingParameters();
ThreadingParameters rThreads = new ThreadingParameters();
- rThreads.setMaxThreads(threads.getMaxThreads());
- rThreads.setMinThreads(threads.getMinThreads());
+ if (threads.getMaxThreads() != null) {
+ rThreads.setMaxThreads(threads.getMaxThreads());
+ }
+ if (threads.getMinThreads() != null) {
+ rThreads.setMinThreads(threads.getMinThreads());
+ }
rThreads.setWorkerIOThreads(threads.getWorkerIOThreads());
eng.setThreadingParameters(rThreads);
}