You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/05/07 23:18:03 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/gui/action Save.java
sebb 2005/05/07 14:18:03
Modified: src/core/org/apache/jmeter/gui/action Save.java
Log:
Ensure file closed when saving 2.0 format
Revision Changes Path
1.26 +37 -19 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java
Index: Save.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Save.java 18 Apr 2005 20:21:11 -0000 1.25
+++ Save.java 7 May 2005 21:18:03 -0000 1.26
@@ -153,11 +153,13 @@
{
}
Writer writer = null;
+ FileOutputStream ostream=null;
try
{
if(JMeterUtils.getPropDefault("file_format","2.1").equals("2.0"))
{
- OldSaveService.saveSubTree(subTree,new FileOutputStream(updateFile));
+ ostream=new FileOutputStream(updateFile);
+ OldSaveService.saveSubTree(subTree,ostream);
}
else
{
@@ -175,6 +177,7 @@
finally
{
closeWriter(writer);
+ closeStream(ostream);
if(testPlanFile != null)
{
GuiPackage.getInstance().getMainFrame().setTitle(JMeterUtils.getExtendedFrameTitle(testPlanFile));
@@ -195,7 +198,37 @@
}
}
- public static class Test extends junit.framework.TestCase
+ private void closeWriter(Writer writer)
+ {
+ if (writer != null)
+ {
+ try
+ {
+ writer.close();
+ }
+ catch (Exception ex)
+ {
+ log.error("", ex);
+ }
+ }
+ }
+
+ private void closeStream(FileOutputStream fos)
+ {
+ if (fos != null)
+ {
+ try
+ {
+ fos.close();
+ }
+ catch (Exception ex)
+ {
+ log.error("", ex);
+ }
+ }
+ }
+
+ public static class Test extends junit.framework.TestCase
{
Save save;
public Test(String name)
@@ -231,19 +264,4 @@
root.getTestElement().getClass().getName());
}
}
-
- private void closeWriter(Writer writer)
- {
- if (writer != null)
- {
- try
- {
- writer.close();
- }
- catch (Exception ex)
- {
- log.error("", ex);
- }
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org