more code simplification with 1.7 features

1 files changed, 4 insertions, 13 deletions

diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
index c7303cef5..0543c334d 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
@@ -87,6 +87,8 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.Reader;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -688,19 +690,12 @@ public class Maven2RepositoryStorage
         try
         {
             // MavenXpp3Reader leaves the file open, so we need to close it ourselves.
-            FileReader reader = new FileReader( pom );
+
             Model model = null;
-            try
+            try (Reader reader = Files.newBufferedReader( pom.toPath(), Charset.defaultCharset() ))
             {
                 model = MAVEN_XPP_3_READER.read( reader );
             }
-            finally
-            {
-                if ( reader != null )
-                {
-                    reader.close();
-                }
-            }
 
             DistributionManagement dist = model.getDistributionManagement();
             if ( dist != null )
@@ -724,10 +719,6 @@ public class Maven2RepositoryStorage
                 }
             }
         }
-        catch ( FileNotFoundException e )
-        {
-            // Artifact has no POM in repo : ignore
-        }
         catch ( IOException e )
         {
             // Unable to read POM : ignore.