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:51:29 UTC
[cxf] branch master updated: [CXF-8041]Error resolving relative XSD
Schema on Tomcat
This is an automated email from the ASF dual-hosted git repository.
ffang 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 d131573 [CXF-8041]Error resolving relative XSD Schema on Tomcat
new 2e3a749 Merge branch 'master' of github.com:apache/cxf
d131573 is described below
commit d1315732be55b89c25f66213d1f0a0e0567d8abc
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue May 21 13:49:24 2019 -0400
[CXF-8041]Error resolving relative XSD Schema on Tomcat
---
.../apache/cxf/transport/servlet/ServletContextResourceResolver.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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 81365fb..94bb824 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,7 +107,8 @@ public class ServletContextResourceResolver implements ResourceResolver {
urlMap.put(url.toString(), url);
return clz.cast(url);
}
- } catch (MalformedURLException | URISyntaxException e1) {
+ } catch (MalformedURLException | URISyntaxException
+ | IllegalArgumentException e1) {
//ignore
}
} else if (clz.isAssignableFrom(InputStream.class)) {