cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [cxf] 01/02: Revert "Fixing build"
Date Thu, 23 May 2019 17:56:29 GMT
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 78ad520241490b0f2a3d06131422870b117d15c0
Author: Freeman Fang <freeman.fang@gmail.com>
AuthorDate: Thu May 23 13:49:14 2019 -0400

    Revert "Fixing build"
    
    This reverts commit 3ccccd324b656f83a965a44343e29fcc86b83a21.
---
 .../cxf/transport/servlet/ServletContextResourceResolver.java       | 6 ++++++
 1 file changed, 6 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 a787294..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
@@ -107,8 +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)) {


Mime
View raw message