svn commit: r948141 - in /cxf/branches/2.2.x-fixes: ./ api/src/main/java/org/apache/cxf/io/CachedOutputStream.java

[dkulp]

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);