You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2019/05/02 14:37:17 UTC
[cxf] 02/02: Upgrading Jetty to latest release
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit af6a95f5b7efc141cc55792e10d05d471905cf32
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 2 15:22:02 2019 +0100
Upgrading Jetty to latest release
---
parent/pom.xml | 2 +-
.../org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7601f6e..84d602e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -129,7 +129,7 @@
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.4.0</cxf.jettison.version>
- <cxf.jetty9.version>9.4.14.v20181114</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.18.v20190429</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.undertow.version>2.0.19.Final</cxf.undertow.version>
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 08dfe20..565a8be 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -780,6 +780,8 @@ public class JettyHTTPServerEngine implements ServerEngine {
setClientAuthentication(con,
tlsServerParameters.getClientAuthentication());
con.setCertAlias(tlsServerParameters.getCertAlias());
+ // TODO Once we switch to use SslContextFactory.Server instead, we can get rid of this line
+ con.setEndpointIdentificationAlgorithm(null);
}
@@ -1036,7 +1038,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
}
}
} finally {
- if (contexts != null) {
+ if (contexts != null && contexts.getHandlers() != null) {
for (Handler h : contexts.getHandlers()) {
h.stop();
}