Author: sebb
Date: Sun Nov 26 14:58:29 2006
New Revision: 479444
URL: http://svn.apache.org/viewvc?view=rev&rev=479444
Log:
Bug 41029 - JMeter -t fails to close input JMX file
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java?view=diff&rev=479444&r1=479443&r2=479444
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java
(original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java Sun
Nov 26 14:58:29 2006
@@ -204,10 +204,11 @@
ActionRouter.getInstance().actionPerformed(new
ActionEvent(main, 1, ActionNames.ADD_ALL));
String arg;
if (testFile != null && (arg = testFile.getArgument()) != null)
{
+ FileInputStream reader = null;
try {
File f = new File(arg);
log.info("Loading file: " + f);
- FileInputStream reader = new FileInputStream(f);
+ reader = new FileInputStream(f);
HashTree tree = SaveService.loadTree(reader);
GuiPackage.getInstance().setTestPlanFile(f.getAbsolutePath());
@@ -219,7 +220,9 @@
} catch (Exception e) {
log.error("Failure loading test file", e);
JMeterUtils.reportErrorToUser(e.toString());
- }
+ } finally {
+ JOrphanUtils.closeQuietly(reader);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
