You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/03/05 22:45:06 UTC
[maven] 01/02: [MNG-7304] Use try-with-resources statement
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 20b6cec44af23e2cfe05478dee2bff2ae7a5f339
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Oct 14 21:36:54 2021 +0200
[MNG-7304] Use try-with-resources statement
This closes #589
---
.../legacy/DefaultUpdateCheckManager.java | 54 +++++-----------------
1 file changed, 11 insertions(+), 43 deletions(-)
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
index b2a0ef0..993ac5e 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
@@ -344,66 +344,34 @@ public class DefaultUpdateCheckManager
{
if ( !touchfile.canRead() )
{
- getLogger().debug( "Skipped unreadable resolution tracking file " + touchfile );
+ getLogger().debug( "Skipped unreadable resolution tracking file: " + touchfile );
return null;
}
synchronized ( touchfile.getAbsolutePath().intern() )
{
- FileInputStream in = null;
- FileLock lock = null;
-
try
{
Properties props = new Properties();
- in = new FileInputStream( touchfile );
- lock = in.getChannel().lock( 0, Long.MAX_VALUE, true );
-
- getLogger().debug( "Reading resolution-state from: " + touchfile );
- props.load( in );
-
- lock.release();
- lock = null;
+ try ( FileInputStream in = new FileInputStream( touchfile ) )
+ {
+ try ( FileLock lock = in.getChannel().lock( 0, Long.MAX_VALUE, true ) )
+ {
+ getLogger().debug( "Reading resolution-state from: " + touchfile );
+ props.load( in );
- in.close();
- in = null;
+ return props;
+ }
+ }
- return props;
}
catch ( IOException e )
{
- getLogger().debug( "Failed to read resolution tracking file " + touchfile, e );
+ getLogger().debug( "Failed to read resolution tracking file: " + touchfile, e );
return null;
}
- finally
- {
- if ( lock != null )
- {
- try
- {
- lock.release();
- }
- catch ( IOException e )
- {
- getLogger().debug( "Error releasing shared lock for resolution tracking file: " + touchfile,
- e );
- }
- }
-
- if ( in != null )
- {
- try
- {
- in.close();
- }
- catch ( IOException e )
- {
- getLogger().debug( "Error closing FileChannel for resolution tracking file: " + touchfile, e );
- }
- }
- }
}
}