Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9A30910BE9 for ; Wed, 23 Oct 2013 18:37:11 +0000 (UTC) Received: (qmail 98822 invoked by uid 500); 23 Oct 2013 18:34:19 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98641 invoked by uid 500); 23 Oct 2013 18:34:10 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 98581 invoked by uid 99); 23 Oct 2013 18:34:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Oct 2013 18:34:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Oct 2013 18:34:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8F8872388AA6; Wed, 23 Oct 2013 18:33:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131023183346.8F8872388AA6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) {