sebb 2004/02/20 16:46:20
Modified: src/jorphan/org/apache/jorphan/io TextFile.java
Log:
Try to close even on Exceptions
Revision Changes Path
1.8 +11 -4 jakarta-jmeter/src/jorphan/org/apache/jorphan/io/TextFile.java
Index: TextFile.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/io/TextFile.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TextFile.java 11 Feb 2004 23:57:23 -0000 1.7
+++ TextFile.java 21 Feb 2004 00:46:20 -0000 1.8
@@ -107,9 +107,9 @@
*/
public void setText(String body)
{
+ Writer writer = null;
try
{
- Writer writer;
if (encoding == null)
{
writer = new FileWriter(this);
@@ -126,6 +126,11 @@
}
catch (IOException ioe)
{
+ try {
+ if (writer != null) {
+ writer.close();
+ }
+ } catch (IOException e) {}
log.error("", ioe);
}
}
@@ -139,9 +144,9 @@
{
String lineEnd = System.getProperty("line.separator");
StringBuffer sb = new StringBuffer();
+ Reader reader = null;
try
{
- Reader reader;
if (encoding == null)
{
reader= new FileReader(this);
@@ -167,6 +172,8 @@
{
log.error("", ioe);
}
+ if (reader != null)
+ try {reader.close();} catch (IOException e) {}
return sb.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
