Author: dkulp
Date: Thu Apr 1 17:13:52 2010
New Revision: 930047
URL: http://svn.apache.org/viewvc?rev=930047&view=rev
Log:
[CXF-2727] Fix NPE
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java?rev=930047&r1=930046&r2=930047&view=diff
==============================================================================
---
cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
(original)
+++
cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
Thu Apr 1 17:13:52 2010
@@ -130,7 +130,10 @@ public class TransportURIResolver extend
//ignore
}
}
- if (is == null &&
!DEFAULT_URI_RESOLVER_HANDLES.contains(base.getScheme())) {
+ if (is == null
+ && (base == null
+ || base.getScheme() == null
+ || !DEFAULT_URI_RESOLVER_HANDLES.contains(base.getScheme()))) {
is = super.resolve(curUri, baseUri);
}
return is;