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:18 UTC
[cxf] branch master updated (b7dad93 -> 513f83e)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from b7dad93 Merge branch 'master' of github.com:apache/cxf
new 5cfbdfe Revert "[CXF-8041]Error resolving relative XSD Schema on Tomcat"
new 513f83e [CXF-8041]catch unchecked exceptions for all ResourceResolvers so all ResourceResolvers have chance to run
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:
.../org/apache/cxf/resource/DefaultResourceManager.java | 15 ++++++++++++++-
.../transport/servlet/ServletContextResourceResolver.java | 5 +----
2 files changed, 15 insertions(+), 5 deletions(-)
[cxf] 01/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 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)) {
[cxf] 02/02: [CXF-8041]catch unchecked exceptions for all
ResourceResolvers so all ResourceResolvers have chance to run
Posted by ff...@apache.org.
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 513f83ecbadcae805d541ee246bf1ae0e80fda53
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu May 23 13:46:06 2019 -0400
[CXF-8041]catch unchecked exceptions for all ResourceResolvers so all ResourceResolvers have chance to run
---
.../org/apache/cxf/resource/DefaultResourceManager.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java b/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
index 8088b56..d20f95a 100644
--- a/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
+++ b/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
@@ -114,7 +114,20 @@ public class DefaultResourceManager implements ResourceManager {
if (asStream) {
ret = type.cast(rr.getAsStream(name));
} else {
- ret = rr.resolve(name, type);
+ try {
+ ret = rr.resolve(name, type);
+ } catch (RuntimeException ex) {
+ //ResourceResolver.resolve method expected to
+ //return an instance of the resource or null if the
+ //resource cannot be resolved. So we just catch
+ //Unchecked exceptions during resolving resource and log it.
+ //So other ResourceResolver get chance to be used
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE,
+ "run into exception when using" + rr.getClass().getName(), ex);
+ }
+
+ }
}
if (ret != null) {
break;