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 61382109DE for ; Wed, 28 Aug 2013 20:21:36 +0000 (UTC) Received: (qmail 40113 invoked by uid 500); 28 Aug 2013 20:21:36 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 40061 invoked by uid 500); 28 Aug 2013 20:21:36 -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 40054 invoked by uid 99); 28 Aug 2013 20:21:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Aug 2013 20:21:36 +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, 28 Aug 2013 20:21:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 490932388A9B; Wed, 28 Aug 2013 20:21:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1518358 - /cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java Date: Wed, 28 Aug 2013 20:21:15 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130828202115.490932388A9B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Aug 28 20:21:14 2013 New Revision: 1518358 URL: http://svn.apache.org/r1518358 Log: Merged revisions 1518297 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1518297 | dkulp | 2013-08-28 13:45:06 -0400 (Wed, 28 Aug 2013) | 2 lines Fix NPE on GET requests ........ Modified: cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java Modified: cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java?rev=1518358&r1=1518357&r2=1518358&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java (original) +++ cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java Wed Aug 28 20:21:14 2013 @@ -371,7 +371,7 @@ public class AsyncHTTPConduit extends UR @Override public void close() throws IOException { - if (!chunking) { + if (!chunking && wrappedStream != null) { CachedOutputStream out = (CachedOutputStream)wrappedStream; this.basicEntity.setContentLength(out.size()); wrappedStream = null;