svn commit: r930048 - in /cxf/branches/2.2.x-fixes: ./ api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java

[dkulp]

Author: dkulp
Date: Thu Apr  1 17:16:21 2010
New Revision: 930048

URL: http://svn.apache.org/viewvc?rev=930048&view=rev
Log:
Merged revisions 930047 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r930047 | dkulp | 2010-04-01 13:13:52 -0400 (Thu, 01 Apr 2010) | 1 line
  
  [CXF-2727] Fix NPE
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java?rev=930048&r1=930047&r2=930048&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
 Thu Apr  1 17:16:21 2010
@@ -123,7 +123,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;