You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2011/02/17 14:31:18 UTC
svn commit: r1071608 -
/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Author: brett
Date: Thu Feb 17 13:31:17 2011
New Revision: 1071608
URL: http://svn.apache.org/viewvc?rev=1071608&view=rev
Log:
ensure that it gets closed, even if close throws exception
Modified:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java?rev=1071608&r1=1071607&r2=1071608&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java (original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java Thu Feb 17 13:31:17 2011
@@ -235,8 +235,8 @@ public class Maven2RepositoryMerger
}
finally
{
- out.close();
- input.close();
+ IOUtils.closeQuietly( out );
+ IOUtils.closeQuietly( input );
}
}
Re: svn commit: r1071608 - /archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Posted by Brett Porter <br...@apache.org>.
Sonar FTW. It picked up this additional problem.
On 18/02/2011, at 12:31 AM, brett@apache.org wrote:
> Author: brett
> Date: Thu Feb 17 13:31:17 2011
> New Revision: 1071608
>
> URL: http://svn.apache.org/viewvc?rev=1071608&view=rev
> Log:
> ensure that it gets closed, even if close throws exception
>
> Modified:
> archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
>
> Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
> URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java?rev=1071608&r1=1071607&r2=1071608&view=diff
> ==============================================================================
> --- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java (original)
> +++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java Thu Feb 17 13:31:17 2011
> @@ -235,8 +235,8 @@ public class Maven2RepositoryMerger
> }
> finally
> {
> - out.close();
> - input.close();
> + IOUtils.closeQuietly( out );
> + IOUtils.closeQuietly( input );
> }
> }
>
>
>
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter