From: Olivier Lamy <olamy@apache.org>
Date: Wed, 16 Apr 2014 13:00:24 +0000 (+1000)
Subject: more try with resources
X-Git-Tag: archiva-2.1.0~87
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dc91fae5fada00f27f0210487c70e01bd3865686;p=archiva.git

more try with resources
---

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 c929ff106..066105e20 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
@@ -725,12 +725,9 @@ public class DefaultBrowseService
 
         List<Artifact> artifactDownloadInfos = new ArrayList<>();
 
-        RepositorySession session = repositorySessionFactory.createSession();
-
-        MetadataResolver metadataResolver = session.getResolver();
-
-        try
+        try (RepositorySession session = repositorySessionFactory.createSession())
         {
+            MetadataResolver metadataResolver = session.getResolver();
             for ( String repoId : selectedRepos )
             {
                 List<ArtifactMetadata> artifacts = new ArrayList<>(
@@ -748,13 +745,6 @@ public class DefaultBrowseService
             throw new ArchivaRestServiceException( e.getMessage(),
                                                    Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), e );
         }
-        finally
-        {
-            if ( session != null )
-            {
-                session.closeQuietly();
-            }
-        }
 
         return artifactDownloadInfos;
     }
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java
index 482b79902..092c4b100 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java
@@ -19,7 +19,6 @@ package org.apache.archiva.webdav.util;
  * under the License.
  */
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +37,7 @@ import java.util.StringTokenizer;
 /**
  * MimeTypes
  */
-@Service("mimeTpes")
+@Service( "mimeTpes" )
 public class MimeTypes
 {
     private static final String DEFAULT_MIME_TYPE = "application/octet-stream";
@@ -109,39 +108,38 @@ public class MimeTypes
     {
         mimeMap.clear();
 
-        InputStreamReader reader = null;
-        BufferedReader buf = null;
-
-        try
+        try (InputStreamReader reader = new InputStreamReader( mimeStream ))
         {
-            reader = new InputStreamReader( mimeStream );
-            buf = new BufferedReader( reader );
-            String line = null;
-
-            while ( ( line = buf.readLine() ) != null )
+            try (BufferedReader buf = new BufferedReader( reader ))
             {
-                line = line.trim();
 
-                if ( line.length() == 0 )
-                {
-                    // empty line. skip it
-                    continue;
-                }
+                String line = null;
 
-                if ( line.startsWith( "#" ) )
+                while ( ( line = buf.readLine() ) != null )
                 {
-                    // Comment. skip it
-                    continue;
-                }
+                    line = line.trim();
 
-                StringTokenizer tokenizer = new StringTokenizer( line );
-                if ( tokenizer.countTokens() > 1 )
-                {
-                    String type = tokenizer.nextToken();
-                    while ( tokenizer.hasMoreTokens() )
+                    if ( line.length() == 0 )
+                    {
+                        // empty line. skip it
+                        continue;
+                    }
+
+                    if ( line.startsWith( "#" ) )
                     {
-                        String extension = tokenizer.nextToken().toLowerCase();
-                        this.mimeMap.put( extension, type );
+                        // Comment. skip it
+                        continue;
+                    }
+
+                    StringTokenizer tokenizer = new StringTokenizer( line );
+                    if ( tokenizer.countTokens() > 1 )
+                    {
+                        String type = tokenizer.nextToken();
+                        while ( tokenizer.hasMoreTokens() )
+                        {
+                            String extension = tokenizer.nextToken().toLowerCase();
+                            this.mimeMap.put( extension, type );
+                        }
                     }
                 }
             }
@@ -150,11 +148,6 @@ public class MimeTypes
         {
             log.error( "Unable to read mime types from input stream : " + e.getMessage(), e );
         }
-        finally
-        {
-            IOUtils.closeQuietly( buf );
-            IOUtils.closeQuietly( reader );
-        }
     }
 
     public String getResource()