Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1362484 -
 /cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
Date: Tue, 17 Jul 2012 13:31:27 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20120717133127.DB1B023889E7@eris.apache.org>

Author: dkulp
Date: Tue Jul 17 13:31:27 2012
New Revision: 1362484

URL: http://svn.apache.org/viewvc?rev=1362484&view=rev
Log:
[CXF-4356] Make sure close isn't called twice, thus wiping out the temp
file prematurely

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java?rev=1362484&r1=1362483&r2=1362484&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Tue Jul 17 13:31:27 2012
@@ -464,9 +464,13 @@ public class CachedOutputStream extends 
         } else {
             try {
                 FileInputStream fileInputStream = new FileInputStream(tempFile) {
+                    boolean closed;
                     public void close() throws IOException {
-                        super.close();
-                        maybeDeleteTempFile(this);
+                        if (!closed) {
+                            super.close();
+                            maybeDeleteTempFile(this);
+                        }
+                        closed = true;
                     }
                 };
                 streamList.add(fileInputStream);