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 5C6CC1098C for ; Wed, 24 Jul 2013 15:54:20 +0000 (UTC) Received: (qmail 30193 invoked by uid 500); 24 Jul 2013 15:54:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 30059 invoked by uid 500); 24 Jul 2013 15:54:18 -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 30046 invoked by uid 99); 24 Jul 2013 15:54:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jul 2013 15:54:18 +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, 24 Jul 2013 15:54:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 34ACD23889ED; Wed, 24 Jul 2013 15:53:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1506603 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java Date: Wed, 24 Jul 2013 15:53:57 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130724155357.34ACD23889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Wed Jul 24 15:53:56 2013 New Revision: 1506603 URL: http://svn.apache.org/r1506603 Log: Merged revisions 1506577 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1506577 | sergeyb | 2013-07-24 15:34:43 +0100 (Wed, 24 Jul 2013) | 1 line [CXF-5144] Closing InputStream after read when possible ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1506577 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=1506603&r1=1506602&r2=1506603&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java Wed Jul 24 15:53:56 2013 @@ -508,6 +508,14 @@ public abstract class AbstractClient imp responseMessage); } catch (Exception ex) { reportMessageHandlerProblem("MSG_READER_PROBLEM", cls, contentType, ex, r); + } finally { + if (cls != InputStream.class && inputStream != null) { + try { + inputStream.close(); + } catch (IOException ex) { + // ignore + } + } } } else { reportMessageHandlerProblem("NO_MSG_READER", cls, contentType, null, null);