svn commit: r1454999 - in /cxf/branches/2.7.x-fixes: ./ rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/

[ema]

Author: ema
Date: Mon Mar 11 04:55:17 2013
New Revision: 1454999

URL: http://svn.apache.org/r1454999
Log:
Merged revisions 1454984 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1454984 | ema | 2013-03-11 11:25:26 +0800 (Mon, 11 Mar 2013) | 1 line
  
  [CXF-4875]:Fix NPE when resolve the wsrm policy
........

Added:
    
cxf/branches/2.7.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/BasicDocEndpoint.java
      - copied unchanged from r1454984, 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/BasicDocEndpoint.java
    
cxf/branches/2.7.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/BasicDocEndpointImpl.java
      - copied unchanged from r1454984, 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/BasicDocEndpointImpl.java
    
cxf/branches/2.7.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRMPolicyResolveTest.java
      - copied unchanged from r1454984, 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRMPolicyResolveTest.java
    
cxf/branches/2.7.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml
      - copied unchanged from r1454984, 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml
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/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1454984

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=1454999&r1=1454998&r2=1454999&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
 Mon Mar 11 04:55:17 2013
@@ -233,7 +233,7 @@ public class WSPolicyFeature extends Abs
     
     Policy resolveLocal(PolicyReference ref, final Bus bus, DescriptionInfo i) 
{
         String uri = ref.getURI().substring(1);
-        String absoluteURI = i.getBaseURI() + uri;
+        String absoluteURI = i == null ? uri : i.getBaseURI() + uri;
         PolicyRegistry registry = 
bus.getExtension(PolicyEngine.class).getRegistry();
         Policy resolved = registry.lookup(absoluteURI);
         if (null != resolved) {