Author: henning
Date: Tue Sep 27 03:10:05 2005
New Revision: 291888
URL: http://svn.apache.org/viewcvs?rev=291888&view=rev
Log:
remove potential "did not close stream" issue. Found by findbugs
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java?rev=291888&r1=291887&r2=291888&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java
Tue Sep 27 03:10:05 2005
@@ -348,24 +348,38 @@
{
String contents = "";
- File f = new File(file);
-
- if (f.exists())
+ File f = null;
+ try
{
- try
- {
- FileReader fr = new FileReader(f);
- char[] template = new char[(int) f.length()];
- fr.read(template);
- contents = new String(template);
- }
- catch (Exception e)
+ f = new File(file);
+
+ if (f.exists())
{
- System.out.println(e);
- e.printStackTrace();
+ FileReader fr = null;
+ try
+ {
+ fr = new FileReader(f);
+ char[] template = new char[(int) f.length()];
+ fr.read(template);
+ contents = new String(template);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ finally
+ {
+ if (fr != null)
+ {
+ fr.close();
+ }
+ }
}
}
-
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
return contents;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
