Author: ay Date: Fri Oct 21 16:23:13 2011 New Revision: 1187446 URL: http://svn.apache.org/viewvc?rev=1187446&view=rev Log: Merged revisions 1187403 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1187403 | ay | 2011-10-21 17:36:31 +0200 (Fri, 21 Oct 2011) | 9 lines Merged revisions 1187370 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1187370 | ay | 2011-10-21 16:39:40 +0200 (Fri, 21 Oct 2011) | 1 line [CXF-3871] avoid NPE at getAction in wsa ContextUtils.getAction ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 21 16:23:13 2011 @@ -1,2 +1,2 @@ -/cxf/branches/2.4.x-fixes:1187392 -/cxf/trunk:1187390 +/cxf/branches/2.4.x-fixes:1187392,1187403 +/cxf/trunk:1187370,1187390 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1187446&r1=1187445&r2=1187446&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original) +++ cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Fri Oct 21 16:23:13 2011 @@ -907,7 +907,7 @@ public final class ContextUtils { if (o instanceof QName) { return ((QName)o).getLocalPart(); } - return o.toString(); + return o == null ? null : o.toString(); } public static EndpointReferenceType getNoneEndpointReference() { return NONE_ENDPOINT_REFERENCE;
