Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 50042 invoked from network); 25 Oct 2010 21:44:30 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 Oct 2010 21:44:30 -0000 Received: (qmail 42513 invoked by uid 500); 25 Oct 2010 21:44:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 42457 invoked by uid 500); 25 Oct 2010 21:44:29 -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 42450 invoked by uid 99); 25 Oct 2010 21:44:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Oct 2010 21:44:29 +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; Mon, 25 Oct 2010 21:44:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3707D2388978; Mon, 25 Oct 2010 21:43:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1027279 - in /cxf/branches/2.2.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java Date: Mon, 25 Oct 2010 21:43:33 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101025214333.3707D2388978@eris.apache.org> Author: dkulp Date: Mon Oct 25 21:43:32 2010 New Revision: 1027279 URL: http://svn.apache.org/viewvc?rev=1027279&view=rev Log: Merged revisions 1027275 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes ................ r1027275 | dkulp | 2010-10-25 17:18:49 -0400 (Mon, 25 Oct 2010) | 9 lines Merged revisions 1027274 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1027274 | dkulp | 2010-10-25 17:17:52 -0400 (Mon, 25 Oct 2010) | 1 line Add an NPE guard to the OneWayProcessor. ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java?rev=1027279&r1=1027278&r2=1027279&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java (original) +++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java Mon Oct 25 21:43:32 2010 @@ -86,8 +86,12 @@ public class OneWayProcessorInterceptor partial.setExchange(message.getExchange()); Conduit conduit = message.getExchange().getDestination() .getBackChannel(message, null, null); - conduit.prepare(partial); - conduit.close(partial); + if (conduit != null) { + //for a one-way, the back channel could be + //null if it knows it cannot send anything. + conduit.prepare(partial); + conduit.close(partial); + } } catch (IOException e) { //IGNORE }