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:35:49 UTC
[cxf] branch master 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 master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 6e70d53 [CXF-7956]add NPE guard for jetty and undertow threads configuration in blueprint
6e70d53 is described below
commit 6e70d53a7b256c866efe9a5ec863cb998b0b9e58
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
---
.../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 11f1af3..7d16238 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 7e049b8..6ad5913 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);
}