From: Olivier Lamy <olamy@apache.org>
Date: Thu, 19 Dec 2013 00:51:34 +0000 (+0000)
Subject: correctly close streams
X-Git-Tag: archiva-2.0.0-RC1~73
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fae670bbc1cdee91cdc074f88a3204e43671f296;p=archiva.git

correctly close streams

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1552191 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
index eefe81a7b..59c352b25 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
@@ -575,17 +575,19 @@ public class DefaultFileUploadService
     private void copyFile( File sourceFile, File targetPath, String targetFilename, boolean fixChecksums )
         throws IOException
     {
-        FileOutputStream out = new FileOutputStream( new File( targetPath, targetFilename ) );
-        FileInputStream input = new FileInputStream( sourceFile );
+        FileOutputStream out = null;
+        FileInputStream input = null;
 
         try
         {
+            out = new FileOutputStream( new File( targetPath, targetFilename ) );
+            input = new FileInputStream( sourceFile );
             IOUtils.copy( input, out );
         }
         finally
         {
-            out.close();
-            input.close();
+            IOUtils.closeQuietly( out );
+            IOUtils.closeQuietly( input );
         }
 
         if ( fixChecksums )