Author: dkulp Date: Thu Oct 24 18:09:20 2013 New Revision: 1535472 URL: http://svn.apache.org/r1535472 Log: Merged revisions 1535107 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1535107 | dkulp | 2013-10-23 14:33:46 -0400 (Wed, 23 Oct 2013) | 10 lines 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.6.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java?rev=1535472&r1=1535471&r2=1535472&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java Thu Oct 24 18:09:20 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) {
