cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1535107 - /cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java
Date Wed, 23 Oct 2013 18:33:46 GMT
Author: dkulp
Date: Wed Oct 23 18:33:46 2013
New Revision: 1535107

URL: http://svn.apache.org/r1535107
Log:
Merged revisions 1535092 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1535092 | dkulp | 2013-10-23 14:17:58 -0400 (Wed, 23 Oct 2013) | 2 lines

  Add some NPE guards

........

Modified:
    cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java

Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java?rev=1535107&r1=1535106&r2=1535107&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java Wed
Oct 23 18:33:46 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) {



Mime
View raw message