svn commit: r1480317 - in /cxf/branches/2.7.x-fixes: ./ rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java

[dkulp]

Author: dkulp
Date: Wed May  8 15:12:38 2013
New Revision: 1480317

URL: http://svn.apache.org/r1480317
Log:
Merged revisions 1480310 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1480310 | dkulp | 2013-05-08 10:58:51 -0400 (Wed, 08 May 2013) | 1 line
  
  Fix a potential NPE when using java-first clients and the WSPolicy feature 
within spring
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java

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

Modified: 
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java?rev=1480317&r1=1480316&r2=1480317&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
 Wed May  8 15:12:38 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);
         }