svn commit: r1480310 - /cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java

[dkulp]

Author: dkulp
Date: Wed May  8 14:58:51 2013
New Revision: 1480310

URL: http://svn.apache.org/r1480310
Log:
Fix a potential NPE when using java-first clients and the WSPolicy feature 
within spring

Modified:
    
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java

Modified: 
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java?rev=1480310&r1=1480309&r2=1480310&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
 (original)
+++ 
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
 Wed May  8 14:58:51 2013
@@ -220,7 +220,8 @@ public class WSPolicyFeature extends Abs
     Policy resolveReference(PolicyReference ref, PolicyBuilder builder, Bus 
bus, DescriptionInfo i) {
         Policy p = null;
         if (!ref.getURI().startsWith("#")) {
-            p = resolveExternal(ref, i.getBaseURI(), bus);
+            String base = i == null ? null : i.getBaseURI();
+            p = resolveExternal(ref, base, bus);
         } else {
             p = resolveLocal(ref, bus, i);
         }