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 <[email protected]> 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)) {
