svn commit: r1040930 - /archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java

[br...@apache.org]

Author: brett
Date: Wed Dec  1 10:15:55 2010
New Revision: 1040930

URL: http://svn.apache.org/viewvc?rev=1040930&view=rev
Log:
[MRM-1437] close stream in CLI
Submitted by: Dave Brosius

Modified:
    archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java

Modified: archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java?rev=1040930&r1=1040929&r2=1040930&view=diff
==============================================================================
--- archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java (original)
+++ archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java Wed Dec  1 10:15:55 2010
@@ -23,6 +23,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -66,14 +67,28 @@ public class ArchivaCli
     public static final String TARGET_REPO_PATH = "targetRepositoryPath";
 
     public static final String BLACKLISTED_PATTERNS = "blacklistPatterns";
+    
+    public static final String POM_PROPERTIES = "/META-INF/maven/org.apache.archiva/archiva-cli/pom.properties";
 
     private static String getVersion()
         throws IOException
     {
-        Properties properties = new Properties();
-        properties.load(
-            ArchivaCli.class.getResourceAsStream( "/META-INF/maven/org.apache.archiva/archiva-cli/pom.properties" ) );
-        return properties.getProperty( "version" );
+        InputStream pomStream = ArchivaCli.class.getResourceAsStream( POM_PROPERTIES );
+        if ( pomStream == null )
+        {
+            throw new IOException( "Failed to load " + POM_PROPERTIES );
+        }
+
+        try
+        {
+            Properties properties = new Properties();
+            properties.load( pomStream );
+            return properties.getProperty( "version" );
+        }
+        finally
+        {
+            IOUtils.closeQuietly( pomStream );
+        }
     }
 
     private PlexusClassPathXmlApplicationContext applicationContext;