You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/23 21:04:22 UTC
svn commit: r729081 - /maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java

Author: bentmann
Date: Tue Dec 23 12:04:22 2008
New Revision: 729081

URL: http://svn.apache.org/viewvc?rev=729081&view=rev
Log:
o Fixed file leaks

Modified:
    maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java

Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java?rev=729081&r1=729080&r2=729081&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java Tue Dec 23 12:04:22 2008
@@ -137,12 +137,30 @@
     {
         assertEquals( 7, outputDirectory.listFiles().length );
         Properties result = new Properties();
-        result.load( new FileInputStream( new File( outputDirectory, "empty-maven-resources-filtering.txt" ) ) );
+        FileInputStream in = null;
+        try
+        {
+            in = new FileInputStream( new File( outputDirectory, "empty-maven-resources-filtering.txt" ) );
+            result.load( in );
+        }
+        finally
+        {
+            IOUtil.close( in );
+        }
 
         assertTrue( result.isEmpty() );
 
         result = new Properties();
-        result.load( new FileInputStream( new File( outputDirectory, "maven-resources-filtering.txt" ) ) );
+        in = null;
+        try
+        {
+            in = new FileInputStream( new File( outputDirectory, "maven-resources-filtering.txt" ) );
+            result.load( in );
+        }
+        finally
+        {
+            IOUtil.close( in );
+        }
         assertFalse( result.isEmpty() );
 
         assertEquals( "1.0", result.get( "version" ) );
@@ -261,10 +279,13 @@
         {
             return false;
         }
-        FileInputStream expectedIn = new FileInputStream( expected );
-        FileInputStream currentIn = new FileInputStream( current );
+        FileInputStream expectedIn = null;
+        FileInputStream currentIn = null;
         try
         {
+            expectedIn = new FileInputStream( expected );
+            currentIn = new FileInputStream( current );
+
             byte[] expectedBuffer = IOUtil.toByteArray( expectedIn );
 
             byte[] currentBuffer = IOUtil.toByteArray( currentIn );
@@ -282,8 +303,8 @@
         }
         finally
         {
-            expectedIn.close();
-            currentIn.close();
+            IOUtil.close( expectedIn );
+            IOUtil.close( currentIn );
         }
         return true;
     }