You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by ay...@apache.org on 2011/10/21 16:39:41 UTC

svn commit: r1187370 - /cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java

Author: ay
Date: Fri Oct 21 14:39:40 2011
New Revision: 1187370

URL: http://svn.apache.org/viewvc?rev=1187370&view=rev
Log:
[CXF-3871] avoid NPE at getAction in wsa ContextUtils.getAction

Modified:
    cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java

Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1187370&r1=1187369&r2=1187370&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Fri Oct 21 14:39:40 2011
@@ -918,7 +918,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;