From: Olivier Lamy <olamy@apache.org>
Date: Sun, 8 Jul 2012 16:16:01 +0000 (+0000)
Subject: correctly close jarFile in a finally block
X-Git-Tag: archiva-1.4-M3~534
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=35c58406a80d76fe13da917ab7eaf70e117f0489;p=archiva.git

correctly close jarFile in a finally block

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

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
index 5228ae621..7896ec50c 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
@@ -752,6 +752,7 @@ public class DefaultBrowseService
                     }
                     finally
                     {
+                        closeQuietly( jarFile );
                         IOUtils.closeQuietly( inputStream );
                     }
                 }
@@ -782,6 +783,21 @@ public class DefaultBrowseService
         return new ArtifactContent();
     }
 
+    private void closeQuietly( JarFile jarFile )
+    {
+        if ( jarFile != null )
+        {
+            try
+            {
+                jarFile.close();
+            }
+            catch ( IOException e )
+            {
+                log.warn( "ignore error closing jarFile {}", jarFile.getName() );
+            }
+        }
+    }
+
     //---------------------------
     // internals
     //---------------------------