Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 11203 invoked from network); 25 May 2010 18:03:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 May 2010 18:03:44 -0000 Received: (qmail 88335 invoked by uid 500); 25 May 2010 18:03:44 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 88295 invoked by uid 500); 25 May 2010 18:03:43 -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 88288 invoked by uid 99); 25 May 2010 18:03:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 May 2010 18:03:43 +0000 X-ASF-Spam-Status: No, hits=-1263.2 required=10.0 tests=ALL_TRUSTED,AWL 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, 25 May 2010 18:03:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E9A823889C5; Tue, 25 May 2010 18:03:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r948141 - in /cxf/branches/2.2.x-fixes: ./ api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Date: Tue, 25 May 2010 18:03:23 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100525180323.0E9A823889C5@eris.apache.org> Author: dkulp Date: Tue May 25 18:03:22 2010 New Revision: 948141 URL: http://svn.apache.org/viewvc?rev=948141&view=rev Log: Merged revisions 946529 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r946529 | gmazza | 2010-05-20 01:14:53 -0400 (Thu, 20 May 2010) | 4 lines CXF-2816 Fix: CachedOutputStream leaves behind temp files if resetOut() is called. Patch by Aaron Pieper. ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java?rev=948141&r1=948140&r2=948141&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java (original) +++ cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Tue May 25 18:03:22 2010 @@ -228,8 +228,8 @@ public class CachedOutputStream extends } else { // read the file currentStream.close(); - FileInputStream fin = new FileInputStream(tempFile); if (copyOldContent) { + FileInputStream fin = new FileInputStream(tempFile); IOUtils.copyAndCloseInput(fin, out); } streamList.remove(currentStream);