Author: dkulp
Date: Fri Oct 30 18:40:20 2009
New Revision: 831417
URL: http://svn.apache.org/viewvc?rev=831417&view=rev
Log:
Add NPE guard
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=831417&r1=831416&r2=831417&view=diff
==============================================================================
---
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
(original)
+++
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Fri Oct 30 18:40:20 2009
@@ -205,7 +205,7 @@
// do nothing
}
- if (is == null && baseUriStr.startsWith("classpath:")) {
+ if (is == null && baseUriStr != null &&
baseUriStr.startsWith("classpath:")) {
tryClasspath(baseUriStr + uriStr);
}
if (is == null && uri != null && "file".equals(uri.getScheme())) {
