Author: ecki
Date: Mon May 19 22:32:44 2014
New Revision: 1596086

URL: http://svn.apache.org/r1596086
Log:
[FILEUPLOAD-248] DiskFileItem might suppress critical IOExceptions on rename - 
use FileUtil.move instead.
Also: close input stream silently to make delete more probable. Remove unneeded 
BufferedInputStream indirection for readFully().

Modified:
    commons/proper/fileupload/trunk/src/changes/changes.xml
    
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java

Modified: commons/proper/fileupload/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/changes/changes.xml?rev=1596086&r1=1596085&r2=1596086&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/changes/changes.xml (original)
+++ commons/proper/fileupload/trunk/src/changes/changes.xml Mon May 19 22:32:44 
2014
@@ -43,8 +43,8 @@ The <action> type attribute can be add,u
   </properties>
 
   <body>
-    <release version="1.4" date="TBA" description=
-"TBA">
+    <release version="1.4" date="TBA" description="TBA">
+      <action issue="FILEUPLOAD-248" dev="ecki" type="fix">DiskFileItem might 
suppress critical IOExceptions on rename - use FileUtil.move instead</action>
       <action issue="FILEUPLOAD-251" dev="sebb" 
type="fix">DiskFileItem#getTempFile() is broken</action>
       <action issue="FILEUPLOAD-250" dev="sebb" type="fix">FileUploadBase - 
potential resource leak - InputStream not closed on exception</action>
       <action issue="FILEUPLOAD-244" dev="sebb" 
type="fix">DiskFileItem.readObject fails to close FileInputStream</action>

Modified: 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
URL: 
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java?rev=1596086&r1=1596085&r2=1596086&view=diff
==============================================================================
--- 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
 (original)
+++ 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
 Mon May 19 22:32:44 2014
@@ -19,7 +19,6 @@ package org.apache.commons.fileupload.di
 import static java.lang.String.format;
 
 import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -39,6 +38,7 @@ import org.apache.commons.fileupload.Fil
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.ParameterParser;
 import org.apache.commons.fileupload.util.Streams;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.DeferredFileOutputStream;
 
@@ -312,7 +312,7 @@ public class DiskFileItem
         InputStream fis = null;
 
         try {
-            fis = new BufferedInputStream(new FileInputStream(dfos.getFile()));
+            fis = new FileInputStream(dfos.getFile());
             IOUtils.readFully(fis, fileData);
         } catch (IOException e) {
             fileData = null;
@@ -403,20 +403,7 @@ public class DiskFileItem
                  * in a temporary location so move it to the
                  * desired file.
                  */
-                if (!outputFile.renameTo(file)) {
-                    BufferedInputStream in = null;
-                    BufferedOutputStream out = null;
-                    try {
-                        in = new BufferedInputStream(
-                            new FileInputStream(outputFile));
-                        out = new BufferedOutputStream(
-                                new FileOutputStream(file));
-                        IOUtils.copy(in, out);
-                    } finally {
-                        IOUtils.closeQuietly(in);
-                        IOUtils.closeQuietly(out);
-                    }
-                }
+                FileUtils.moveFile(outputFile, file);
             } else {
                 /*
                  * For whatever reason we cannot write the
@@ -672,7 +659,7 @@ public class DiskFileItem
         } else {
             FileInputStream input = new FileInputStream(dfosFile);
             IOUtils.copy(input, output);
-            input.close();
+            IOUtils.closeQuietly(input);
             dfosFile.delete();
             dfosFile = null;
         }


Reply via email to