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/23 17:56:30 UTC
[cxf] 02/02: Revert "[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 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ec72ef600b32e46f77aaa402707b5ed90f4b3add
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu May 23 13:49:49 2019 -0400
Revert "[CXF-8041]Error resolving relative XSD Schema on Tomcat"
This reverts commit 11ee40ba08c308bb3f012d21c68ddb35cca1d1c8.
---
.../cxf/transport/servlet/ServletContextResourceResolver.java | 7 -------
1 file changed, 7 deletions(-)
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 2eb88cd..fb99256 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,8 +93,6 @@ public class ServletContextResourceResolver implements ResourceResolver {
//fallthrough
} catch (URISyntaxException e) {
//ignore
- } catch (IllegalArgumentException e) {
- //ignore
}
try {
URL url = servletContext.getResource("/" + entryName);
@@ -107,14 +105,9 @@ 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)) {