Author: dkulp
Date: Fri Oct 30 18:43:54 2009
New Revision: 831418
URL: http://svn.apache.org/viewvc?rev=831418&view=rev
Log:
Merged revisions 831417 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r831417 | dkulp | 2009-10-30 14:40:20 -0400 (Fri, 30 Oct 2009) | 1 line
Add NPE guard
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=831418&r1=831417&r2=831418&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
(original)
+++
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Fri Oct 30 18:43:54 2009
@@ -205,7 +205,10 @@
// do nothing
}
- if (uri != null && "file".equals(uri.getScheme())) {
+ if (is == null && baseUriStr != null &&
baseUriStr.startsWith("classpath:")) {
+ tryClasspath(baseUriStr + uriStr);
+ }
+ if (is == null && uri != null && "file".equals(uri.getScheme())) {
try {
file = new File(uri);
} catch (IllegalArgumentException iae) {
