Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 9327 invoked from network); 19 Jan 2010 18:49:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Jan 2010 18:49:16 -0000 Received: (qmail 25012 invoked by uid 500); 19 Jan 2010 18:49:16 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 24932 invoked by uid 500); 19 Jan 2010 18:49:16 -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 24923 invoked by uid 99); 19 Jan 2010 18:49:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jan 2010 18:49:16 +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, 19 Jan 2010 18:49:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9D33E2388A3B; Tue, 19 Jan 2010 18:48:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r900903 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Date: Tue, 19 Jan 2010 18:48:53 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100119184853.9D33E2388A3B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Jan 19 18:48:52 2010 New Revision: 900903 URL: http://svn.apache.org/viewvc?rev=900903&view=rev Log: Merged revisions 900899 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r900899 | dkulp | 2010-01-19 13:45:46 -0500 (Tue, 19 Jan 2010) | 1 line NPE guard ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=900903&r1=900902&r2=900903&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original) +++ cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Tue Jan 19 18:48:52 2010 @@ -473,6 +473,9 @@ * @param outMessage */ private void cacheInput(Message outMessage) { + if (outMessage.getExchange() == null) { + return; + } Message inMessage = outMessage.getExchange().getInMessage(); if (inMessage == null) { return;