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:46:19 UTC

[cxf] 01/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 master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 5cfbdfeb59581514f3b2773abdca57728e19fdad
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu May 23 12:28:44 2019 -0400

    Revert "[CXF-8041]Error resolving relative XSD Schema on Tomcat"
    
    This reverts commit d1315732be55b89c25f66213d1f0a0e0567d8abc.
---
 .../apache/cxf/transport/servlet/ServletContextResourceResolver.java | 5 +----
 1 file changed, 1 insertion(+), 4 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 94bb824..81365fb 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,8 +105,7 @@ public class ServletContextResourceResolver implements ResourceResolver {
                     urlMap.put(url.toString(), url);
                     return clz.cast(url);
                 }
-            } catch (MalformedURLException | URISyntaxException 
-                | IllegalArgumentException e1) {
+            } catch (MalformedURLException | URISyntaxException e1) {
                 //ignore
             }
         } else if (clz.isAssignableFrom(InputStream.class)) {