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/12/04 18:15:29 UTC
[cxf] branch 3.3.x-fixes updated (9204b49 -> 0ddbce4)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 9204b49 Updating Odata
new 7cd4288 Updating Jetty (#606)
new bfc1d71 It seems that the ending slash should be remved but current code does nothing at all. (#609)
new 91ec685 Recording .gitmergeinfo Changes
new 0ddbce4 cxf-rt-databinding-jaxb: fix 'Container contents are never accessed'
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
.../main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java | 2 +-
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java | 5 -----
.../org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java | 3 ++-
6 files changed, 6 insertions(+), 9 deletions(-)
[cxf] 04/04: cxf-rt-databinding-jaxb: fix 'Container contents are
never accessed'
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0ddbce46e94814f8c69dcd1a180a61db14ee22a2
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Dec 2 14:01:12 2019 +0300
cxf-rt-databinding-jaxb: fix 'Container contents are never accessed'
(cherry picked from commit 1530028206b09a9b03e585a4324c4274a967597e)
---
.../jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java | 5 -----
1 file changed, 5 deletions(-)
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index 8f9d75f..1c0c92d 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -32,7 +32,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -397,10 +396,6 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
throw new ServiceConstructionException("SCHEMA_GEN_EXC", LOG, e);
}
}
- Set<String> ids = new HashSet<>();
- for (DOMSource r : schemas) {
- ids.add(r.getSystemId());
- }
for (DOMSource r : schemas) {
if (bi.contains(r)) {
String ns = ((Document)r.getNode()).getDocumentElement().getAttribute("targetNamespace");
[cxf] 03/04: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 91ec685734fd2462af9673eb6f553246dae8fcc4
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Dec 4 17:24:42 2019 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 09bc259..a4b6a56 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -59,6 +59,7 @@ M 7b50181ebc445bb84d3463b284643432399bc0f8
M 7ef814556d727c147d6f625cbb1170edfd24a752
M 9c462e9bd614d529f0a2fd86490243ea1c858651
M a4fc3a0462f09dd6c6c920385b67e621d7e36399
+M a61ca44ab50c1a3fc20fbaafe89b372809e0f49b
M aabf37788e571426e70250e7a62c7f4502e4d6e9
M bf1b85003e89c4b3e28384f0de476cf0e5b1af12
M c1b729ea9f0c43e6560099dbc427751fe33ee088
[cxf] 02/04: It seems that the ending slash should be remved but
current code does nothing at all. (#609)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit bfc1d712ea2d5ab32aa0f4cab532e423591fd395
Author: Fabian Barney <fa...@users.noreply.github.com>
AuthorDate: Wed Dec 4 18:23:06 2019 +0100
It seems that the ending slash should be remved but current code does nothing at all. (#609)
The following code always dows nothing at all:
address = address.substring(0, address.length());
It seems that the ending slash should be removed in some cases:
address = address.substring(0, address.length() - 1);
(cherry picked from commit e0021c47b65f9328fb57229c4b9e91fbf36d92d7)
---
core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
index d3f9be2..48feaf2 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
@@ -129,7 +129,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
if (uri != null && uri.startsWith("/")) {
if (address != null && !address.startsWith(uri)) {
if (address.endsWith("/") && address.length() > 1) {
- address = address.substring(0, address.length());
+ address = address.substring(0, address.length() - 1);
}
uri = address + uri;
}
[cxf] 01/04: Updating Jetty (#606)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7cd4288b0876f0ab5303aee87adba6ece0cc3a45
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Dec 2 15:04:20 2019 +0200
Updating Jetty (#606)
(cherry picked from commit a61ca44ab50c1a3fc20fbaafe89b372809e0f49b)
# Conflicts:
# 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 6ad99b7..5add313 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 41bb220..a1798d3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -146,7 +146,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>2.1.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());