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/10/23 20:17:58 UTC

svn commit: r1535092 - /cxf/trunk/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java

Author: dkulp
Date: Wed Oct 23 18:17:58 2013
New Revision: 1535092

URL: http://svn.apache.org/r1535092
Log:
Add some NPE guards

Modified:
    cxf/trunk/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java

Modified: cxf/trunk/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java?rev=1535092&r1=1535091&r2=1535092&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java (original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java Wed Oct 23 18:17:58 2013
@@ -160,7 +160,9 @@ public class ExchangeImpl extends String
 
     public void setInFaultMessage(Message m) {
         inFaultMessage = m;
-        m.setExchange(this);
+        if (null != m) {
+            m.setExchange(this);
+        }
     }
 
     public Message getOutFaultMessage() {
@@ -169,7 +171,9 @@ public class ExchangeImpl extends String
 
     public void setOutFaultMessage(Message m) {
         outFaultMessage = m;
-        m.setExchange(this);
+        if (null != m) {
+            m.setExchange(this);
+        }
     }
 
     public void setDestination(Destination d) {