commit d2263ea3fa652a620d70a701b4883aa1ca4c38c5
author Gary D. Gregory <ggregory@apache.org> Thu Feb 06 16:42:19 2014 +0000
committer Gary D. Gregory <ggregory@apache.org> Thu Feb 06 16:42:19 2014 +0000
tree 0fbdbe26ea1f13cb603415b7aefcf9d8487caf00
parent 28c620de7eaa768212056ff754be5bb97c2c4011

Use IOUtils.closeQuietly() instead of custom code.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/fileupload/trunk@1565332 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/commons/fileupload/util/Streams.java

diff --git a/src/main/java/org/apache/commons/fileupload/util/Streams.java b/src/main/java/org/apache/commons/fileupload/util/Streams.java
index 651033e..9e9d58b 100644
--- a/src/main/java/org/apache/commons/fileupload/util/Streams.java
+++ b/src/main/java/org/apache/commons/fileupload/util/Streams.java
@@ -22,6 +22,7 @@
 import java.io.OutputStream;
 
 import org.apache.commons.fileupload.InvalidFileNameException;
+import org.apache.commons.io.IOUtils;
 
 /**
  * Utility class for working with streams.
@@ -119,19 +120,9 @@
             in = null;
             return total;
         } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (Throwable t) {
-                    /* Ignore me */
-                }
-            }
-            if (closeOutputStream  &&  out != null) {
-                try {
-                    out.close();
-                } catch (Throwable t) {
-                    /* Ignore me */
-                }
+            IOUtils.closeQuietly(in);
+            if (closeOutputStream) {
+                IOUtils.closeQuietly(out);
             }
         }
     }