Author: ema Date: Mon Mar 11 05:38:47 2013 New Revision: 1455003 URL: http://svn.apache.org/r1455003 Log: Merged revisions 1455002 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1455002 | ema | 2013-03-11 13:23:01 +0800 (Mon, 11 Mar 2013) | 16 lines Merged revisions 1454999 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1454999 | ema | 2013-03-11 12:55:17 +0800 (Mon, 11 Mar 2013) | 9 lines 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.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/BasicDocEndpoint.java - copied unchanged from r1455002, cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/BasicDocEndpoint.java cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/BasicDocEndpointImpl.java - copied unchanged from r1455002, cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/BasicDocEndpointImpl.java cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRMPolicyResolveTest.java - copied unchanged from r1455002, cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRMPolicyResolveTest.java cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml - copied unchanged from r1455002, cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1454999 Merged /cxf/trunk:r1454984 Merged /cxf/branches/2.6.x-fixes:r1455002 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java?rev=1455003&r1=1455002&r2=1455003&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java Mon Mar 11 05:38:47 2013 @@ -236,7 +236,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) {
