[cxf] branch master updated: Updating Jetty (#606)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch master updated: Updating Jetty (#606)

buhhunyx
This is an automated email from the ASF dual-hosted git repository.

buhhunyx 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 a61ca44  Updating Jetty (#606)
a61ca44 is described below

commit a61ca44ab50c1a3fc20fbaafe89b372809e0f49b
Author: Alexey Markevich <[hidden email]>
AuthorDate: Mon Dec 2 15:04:20 2019 +0200

    Updating Jetty (#606)
---
 distribution/src/main/release/samples/pom.xml                          | 2 +-
 parent/pom.xml                                                         | 2 +-
 .../org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 804b2f0..dc842a9 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,7 +32,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
         <spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version>
-        <cxf.jetty9.version>9.4.22.v20191022</cxf.jetty9.version>
+        <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
         <cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>
         <cxf.tika.version>1.22</cxf.tika.version>
     </properties>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9d6a668..096df24 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -148,7 +148,7 @@
         <cxf.jettison.version>1.4.0</cxf.jettison.version>
         <cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
         <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
-        <cxf.jetty9.version>9.4.22.v20191022</cxf.jetty9.version>
+        <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
         <cxf.jexl.version>3.1</cxf.jexl.version>
         <cxf.joda.time.version>2.9.4</cxf.joda.time.version>
         <cxf.johnzon.version>1.1.13</cxf.johnzon.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 df3fe91..f6aeb4f 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
@@ -37,6 +37,7 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -355,7 +356,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
         // back to the client.
         ErrorHandler eh = new ErrorHandler() {
             public void handle(String target, Request baseRequest, HttpServletRequest request,
-                               HttpServletResponse response) throws IOException {
+                               HttpServletResponse response) throws IOException, ServletException {
                 String msg = (String)request.getAttribute(RequestDispatcher.ERROR_MESSAGE);
                 if (StringUtils.isEmpty(msg) || msg.contains("org.apache.cxf.interceptor.Fault")) {
                     msg = HttpStatus.getMessage(response.getStatus());