You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/07/08 18:16:01 UTC
svn commit: r1358773 -
/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Author: olamy
Date: Sun Jul 8 16:16:01 2012
New Revision: 1358773
URL: http://svn.apache.org/viewvc?rev=1358773&view=rev
Log:
correctly close jarFile in a finally block
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1358773&r1=1358772&r2=1358773&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java Sun Jul 8 16:16:01 2012
@@ -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
//---------------------------