This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.2.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b97be9cb2d2556e5db538fad53e9c42c622c6672 Author: Alexey Markevich <[email protected]> AuthorDate: Mon Dec 2 15:04:20 2019 +0200 Updating Jetty (#606) (cherry picked from commit a61ca44ab50c1a3fc20fbaafe89b372809e0f49b) # Conflicts: # parent/pom.xml (cherry picked from commit 7cd4288b0876f0ab5303aee87adba6ece0cc3a45) # Conflicts: # distribution/src/main/release/samples/pom.xml # parent/pom.xml --- 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 6db5a14..1742b95 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>1.5.17.RELEASE</spring.boot.version> <spring.cloud.eureka.version>1.3.4.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> </properties> <dependencies> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 8085ab0..de6e375 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -126,7 +126,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.22.v20191022</cxf.jetty9.version> + <cxf.jetty9.version>9.4.24.v20191120</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>1.4.27.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 631ecfd..b8c5593 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());
