You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/06/12 20:41:37 UTC
svn commit: r1492347 -
/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
Author: dkulp
Date: Wed Jun 12 18:41:37 2013
New Revision: 1492347
URL: http://svn.apache.org/r1492347
Log:
Merged revisions 1483930 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1483930 | dkulp | 2013-05-17 14:09:21 -0400 (Fri, 17 May 2013) | 17 lines
Merged revisions 1480317 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1480317 | dkulp | 2013-05-08 11:12:38 -0400 (Wed, 08 May 2013) | 9 lines
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.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/WSPolicyFeature.java
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=1492347&r1=1492346&r2=1492347&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 Wed Jun 12 18:41:37 2013
@@ -223,7 +223,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);
}