You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/10/22 21:47:16 UTC
svn commit: r1401051 -
/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
Author: krosenvold
Date: Mon Oct 22 19:47:16 2012
New Revision: 1401051
URL: http://svn.apache.org/viewvc?rev=1401051&view=rev
Log:
o Working to make the findbugs happy
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java?rev=1401051&r1=1401050&r2=1401051&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java Mon Oct 22 19:47:16 2012
@@ -1874,22 +1874,28 @@ public class FileUtils
if ( file.exists() )
{
- BufferedReader reader = new BufferedReader( new FileReader( file ) );
-
- String line = reader.readLine();
-
- while ( line != null )
+ FileReader fileReader = new FileReader(file);
+ try
{
- line = line.trim();
+ BufferedReader reader = new BufferedReader(fileReader);
+
+ String line = reader.readLine();
- if ( !line.startsWith( "#" ) && line.length() != 0 )
+ while ( line != null )
{
- lines.add( line );
+ line = line.trim();
+
+ if ( !line.startsWith( "#" ) && line.length() != 0 )
+ {
+ lines.add( line );
+ }
+ line = reader.readLine();
}
- line = reader.readLine();
- }
- reader.close();
+ reader.close();
+ } finally {
+ fileReader.close();
+ }
}
return lines;