Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 77249 invoked from network); 15 Dec 2009 22:27:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Dec 2009 22:27:56 -0000 Received: (qmail 25705 invoked by uid 500); 15 Dec 2009 22:27:56 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 25602 invoked by uid 500); 15 Dec 2009 22:27:55 -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 25593 invoked by uid 99); 15 Dec 2009 22:27:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Dec 2009 22:27:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 15 Dec 2009 22:27:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CCEF72388A4E; Tue, 15 Dec 2009 22:27:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r891037 - /cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Date: Tue, 15 Dec 2009 22:27:32 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091215222732.CCEF72388A4E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Dec 15 22:27:32 2009 New Revision: 891037 URL: http://svn.apache.org/viewvc?rev=891037&view=rev Log: Add an NPE guard Modified: cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Modified: cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=891037&r1=891036&r2=891037&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Tue Dec 15 22:27:32 2009 @@ -297,12 +297,14 @@ } message.setContent(Exception.class, ex); + boolean isOneWay = false; if (message.getExchange() != null) { message.getExchange().put(Exception.class, ex); + isOneWay = message.getExchange().isOneWay(); } unwind(message); - if (faultObserver != null && !message.getExchange().isOneWay()) { + if (faultObserver != null && !isOneWay) { faultObserver.onMessage(message); } }