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/05/21 17:53:50 UTC
[cxf] branch 3.2.x-fixes updated (41232aa -> 9f56b64)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 41232aa [CXF-8045]Disable HTTP TRACE method on CXF http-undertow transport
new 11ee40b [CXF-8041]Error resolving relative XSD Schema on Tomcat
new 9f56b64 Recording .gitmergeinfo Changes
The 2 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 +
.../cxf/transport/servlet/ServletContextResourceResolver.java | 7 +++++++
2 files changed, 8 insertions(+)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by ff...@apache.org.
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
commit 9f56b64c5cfc236c94c18d5c9c2c998dd83c0fb1
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue May 21 13:53:22 2019 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 30fdc57..8a2457a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -583,6 +583,7 @@ M af6a95f5b7efc141cc55792e10d05d471905cf32
M c13381d891b56fe5a2b56f6f9f6f6b2cc8a10d5d
M c79d8ac83379b9f80e124823fbb569141cc5e608
M cb2a360153c6670925f91fdfa9980594715d62e2
+M d1315732be55b89c25f66213d1f0a0e0567d8abc
M d1470dd0e14aa001dde1227bfb456a8b4cf0061e
M d419ae389ab4b42bf57106db99758dd8d3b11bca
M e60e8ab5d7414a0dc581c5666873e1ab0413b107
[cxf] 01/02: [CXF-8041]Error resolving relative XSD Schema on Tomcat
Posted by ff...@apache.org.
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
commit 11ee40ba08c308bb3f012d21c68ddb35cca1d1c8
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue May 21 13:49:24 2019 -0400
[CXF-8041]Error resolving relative XSD Schema on Tomcat
(cherry picked from commit d1315732be55b89c25f66213d1f0a0e0567d8abc)
Conflicts:
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
---
.../cxf/transport/servlet/ServletContextResourceResolver.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
index fb99256..2eb88cd 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
@@ -93,6 +93,8 @@ public class ServletContextResourceResolver implements ResourceResolver {
//fallthrough
} catch (URISyntaxException e) {
//ignore
+ } catch (IllegalArgumentException e) {
+ //ignore
}
try {
URL url = servletContext.getResource("/" + entryName);
@@ -105,9 +107,14 @@ public class ServletContextResourceResolver implements ResourceResolver {
urlMap.put(url.toString(), url);
return clz.cast(url);
}
+<<<<<<< HEAD
} catch (MalformedURLException e1) {
//ignore
} catch (URISyntaxException e) {
+=======
+ } catch (MalformedURLException | URISyntaxException
+ | IllegalArgumentException e1) {
+>>>>>>> d131573... [CXF-8041]Error resolving relative XSD Schema on Tomcat
//ignore
}
} else if (clz.isAssignableFrom(InputStream.class)) {