sebb 2004/06/25 17:54:16
Modified: src/core/org/apache/jmeter/util JMeterUtils.java
Log:
Ensure file is closed
Revision Changes Path
1.68 +12 -4 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- JMeterUtils.java 12 Jun 2004 17:11:44 -0000 1.67
+++ JMeterUtils.java 26 Jun 2004 00:54:16 -0000 1.68
@@ -350,10 +350,11 @@
}
public static String getResourceFileAsText(String name)
{
+ BufferedReader fileReader = null;
try
{
String lineEnd = System.getProperty("line.separator");
- BufferedReader fileReader =
+ fileReader =
new BufferedReader(
new InputStreamReader(
JMeterUtils.class.getClassLoader().getResourceAsStream(
@@ -369,7 +370,7 @@
text.append(lineEnd);
}
}
- fileReader.close();
+ //Done by finally block: fileReader.close();
return text.toString();
}
catch (NullPointerException e) // Cannot find file
@@ -380,6 +381,13 @@
{
return "";
}
+ finally
+ {
+ if (fileReader != null)
+ try {
+ fileReader.close();
+ } catch (IOException e1) { }
+ }
}
/**
* Creates the vector of Timers plugins.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
