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:28 UTC
[cxf] branch 3.2.x-fixes updated (a9b27db -> ec72ef6)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from a9b27db Recording .gitmergeinfo Changes
new 78ad520 Revert "Fixing build"
new ec72ef6 Revert "[CXF-8041]Error resolving relative XSD Schema on Tomcat"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cxf/transport/servlet/ServletContextResourceResolver.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
[cxf] 01/02: Revert "Fixing build"
Posted by ff...@apache.org.
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 <fr...@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)) {
[cxf] 02/02: Revert "[CXF-8041]Error resolving relative XSD Schema
on Tomcat"
Posted by ff...@apache.org.
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)) {