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/03/08 03:36:27 UTC
[cxf] branch 3.2.x-fixes updated: [CXF-7977]Port XXXX is configured
with wrong protocol "https"
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 6057f73 [CXF-7977]Port XXXX is configured with wrong protocol "https"
6057f73 is described below
commit 6057f737e0b7495f0f1d449e1635630698aef7cb
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Sun Mar 3 19:47:12 2019 +0800
[CXF-7977]Port XXXX is configured with wrong protocol "https"
(cherry picked from commit 24e55d31e2e6ca7ef5039c67f0282f85f4805c7c)
---
.../http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java | 4 +++-
.../blueprint/UndertowHTTPServerEngineFactoryHolder.java | 4 +++-
2 files changed, 6 insertions(+), 2 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 819687f..25bf7ca 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
@@ -179,7 +179,9 @@ public class JettyHTTPServerEngineFactoryHolder {
}
//eng.setServer(engine.getTlsServerParameters());
- if (engine.getTlsServerParameters() != null) {
+ if (engine.getTlsServerParameters() != null
+ && (engine.getTlsServerParameters().getKeyManagers() != null
+ || engine.getTlsServerParameters().getTrustManagers() != null)) {
TLSServerParameters parameter = null;
try {
parameter = new TLSServerParametersConfig(engine.getTlsServerParameters());
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 d44e27d..9d7c916 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
@@ -160,7 +160,9 @@ public class UndertowHTTPServerEngineFactoryHolder {
}
- if (engine.getTlsServerParameters() != null) {
+ if (engine.getTlsServerParameters() != null
+ && (engine.getTlsServerParameters().getKeyManagers() != null
+ || engine.getTlsServerParameters().getTrustManagers() != null)) {
TLSServerParameters parameter = null;
try {
parameter = new TLSServerParametersConfig(engine.getTlsServerParameters());