svn commit: r471290 - /maven/components/branches/maven-2.0.x/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java

[vsiveton]

Author: vsiveton
Date: Sat Nov  4 14:55:22 2006
New Revision: 471290

URL: http://svn.apache.org/viewvc?view=rev&rev=471290
Log:
MNG-2299: org.apache.maven.it.Verifier.loadProperties(..) does not close 
FileInputStream (relies upon finalizer being called)
Submitted by: John Sisson 
Reviewed by: Vincent Siveton

o applied with small changes
o fixed also the loadFile()

Modified:
    
maven/components/branches/maven-2.0.x/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java

Modified: 
maven/components/branches/maven-2.0.x/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java?view=diff&rev=471290&r1=471289&r2=471290
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
 Sat Nov  4 14:55:22 2006
@@ -138,7 +138,7 @@
     {
         Properties properties = new Properties();
 
-        FileInputStream fis;
+        FileInputStream fis = null;
         try
         {
             File propertiesFile = new File( basedir, filename );
@@ -156,6 +156,20 @@
         {
             throw new VerificationException( "Error reading properties file", 
e );
         }
+        finally
+        {
+            if ( fis != null )
+            {
+                try
+                {
+                    fis.close();
+                }
+                catch ( IOException e )
+                {
+                    throw new VerificationException( "Error reading properties 
file", e );
+                }
+            }
+        }
 
         return properties;
     }
@@ -173,9 +187,10 @@
 
         if ( file.exists() )
         {
+            BufferedReader reader = null;
             try
             {
-                BufferedReader reader = new BufferedReader( new FileReader( 
file ) );
+                reader = new BufferedReader( new FileReader( file ) );
 
                 String line = reader.readLine();
 
@@ -189,8 +204,6 @@
                     }
                     line = reader.readLine();
                 }
-
-                reader.close();
             }
             catch ( FileNotFoundException e )
             {
@@ -199,6 +212,20 @@
             catch ( IOException e )
             {
                 throw new VerificationException( e );
+            }
+            finally
+            {
+                if ( reader != null )
+                {
+                    try
+                    {
+                        reader.close();
+                    }
+                    catch ( IOException e )
+                    {
+                        throw new VerificationException( e );
+                    }
+                }
             }
         }