Author: sebb
Date: Mon Apr 30 15:13:40 2007
New Revision: 533867
URL: http://svn.apache.org/viewvc?view=rev&rev=533867
Log:
Bug 36755 (patch 20073) - consistent closing of file streams
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveGraphicsService.java
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/io/TextFile.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/JMeterReport.java
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
Mon Apr 30 15:13:40 2007
@@ -64,6 +64,7 @@
import org.apache.jorphan.gui.RendererUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.Functor;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
/**
@@ -389,11 +390,12 @@
writer = new FileWriter(output);
Vector data = this.getAllTableData();
OldSaveService.saveCSVStats(data,writer);
- writer.close();
} catch (FileNotFoundException e) {
log.warn(e.getMessage());
} catch (IOException e) {
log.warn(e.getMessage());
+ } finally {
+ JOrphanUtils.closeQuietly(writer);
}
}
}
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=533867&r1=533866&r2=533867
==============================================================================
--- 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 Mon
Apr 30 15:13:40 2007
@@ -675,7 +675,9 @@
} catch (Exception e) {
System.out.println("Error in NonGUIDriver " +
e.toString());
log.error("", e);
- }
+ } finally {
+ JOrphanUtils.closeQuietly(reader);
+ }
}
/**
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Load.java
Mon Apr 30 15:13:40 2007
@@ -21,7 +21,6 @@
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.util.HashSet;
import java.util.Set;
@@ -40,6 +39,7 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
import com.thoughtworks.xstream.converters.ConversionException;
@@ -113,13 +113,7 @@
}
JMeterUtils.reportErrorToUser(msg);
} finally {
- try {
- if (reader!=null) {
- reader.close();
- }
- } catch (IOException e1) {
- // ignored
- }
+ JOrphanUtils.closeQuietly(reader);
GuiPackage.getInstance().updateCurrentGui();
GuiPackage.getInstance().getMainFrame().repaint();
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Save.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Save.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Save.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Save.java
Mon Apr 30 15:13:40 2007
@@ -20,7 +20,6 @@
import java.awt.event.ActionEvent;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
@@ -37,6 +36,7 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
/**
@@ -114,7 +114,7 @@
log.error("", ex);
throw new IllegalUserActionException("Couldn't save
test plan to file: " + updateFile);
} finally {
- closeStream(ostream);
+ JOrphanUtils.closeQuietly(ostream);
}
}
@@ -128,15 +128,4 @@
tree.replace(item, testElement);
}
}
-
- private void closeStream(FileOutputStream fos) {
- if (fos != null) {
- try {
- fos.close();
- } catch (IOException ex) {
- log.error("", ex);
- }
- }
- }
-
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java
Mon Apr 30 15:13:40 2007
@@ -30,6 +30,7 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
/**
@@ -132,11 +133,7 @@
} catch (IOException e1) {
log.error("Error saving sample " + s.getSampleLabel(),
e1);
} finally {
- try {
- if (pw != null)
- pw.close();
- } catch (IOException e) {
- }
+ JOrphanUtils.closeQuietly(pw);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveGraphicsService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveGraphicsService.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveGraphicsService.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveGraphicsService.java
Mon Apr 30 15:13:40 2007
@@ -35,6 +35,7 @@
import org.apache.batik.ext.awt.image.codec.PNGImageEncoder;
import org.apache.batik.ext.awt.image.codec.tiff.TIFFEncodeParam;
import org.apache.batik.ext.awt.image.codec.tiff.TIFFImageEncoder;
+import org.apache.jorphan.util.JOrphanUtils;
/**
* Class is responsible for taking a component and saving it as a JPEG, PNG or
@@ -90,14 +91,10 @@
try {
encoder.encode(image);
- fos.close();
} catch (Exception e) {
e.printStackTrace();
} finally {
- try {
- fos.close();
- } catch (Exception e) {
- }
+ JOrphanUtils.closeQuietly(fos);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPathFileContainer.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
Mon Apr 30 15:13:40 2007
@@ -29,6 +29,7 @@
import javax.xml.transform.TransformerException;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
import org.apache.xpath.XPathAPI;
import org.w3c.dom.NodeList;
@@ -100,8 +101,7 @@
log.warn(e.toString());
throw e;
} finally {
- if (fis != null)
- fis.close();
+ JOrphanUtils.closeQuietly(fis);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/io/TextFile.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/io/TextFile.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/io/TextFile.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/io/TextFile.java
Mon Apr 30 15:13:40 2007
@@ -119,16 +119,11 @@
}
writer.write(body);
writer.flush();
- writer.close();
} catch (IOException ioe) {
- try {
- if (writer != null) {
- writer.close();
- }
- } catch (IOException e) {
- }
log.error("", ioe);
- }
+ } finally {
+ JOrphanUtils.closeQuietly(writer);
+ }
}
/**
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
Mon Apr 30 15:13:40 2007
@@ -27,6 +27,7 @@
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
+import org.apache.jorphan.util.JOrphanUtils;
/**
* Description:<br>
@@ -117,15 +118,8 @@
* @see org.apache.jmeter.protocol.http.util.accesslog.Generator#close()
*/
public void close() {
- try {
- if (OUTPUT != null) {
- OUTPUT.close();
- }
- if (WRITER != null) {
- WRITER.close();
- }
- } catch (IOException exception) {
- }
+ JOrphanUtils.closeQuietly(OUTPUT);
+ JOrphanUtils.closeQuietly(WRITER);
}
/*
Modified:
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/JMeterReport.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/JMeterReport.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/JMeterReport.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/JMeterReport.java
Mon Apr 30 15:13:40 2007
@@ -223,10 +223,11 @@
ReportActionRouter.getInstance().actionPerformed(new ActionEvent(main,
1, ReportCheckDirty.ADD_ALL));
if (testFile != null) {
+ FileInputStream reader = null;
try {
File f = new File(testFile.getArgument());
log.info("Loading file: " + f);
- FileInputStream reader = new FileInputStream(f);
+ reader = new FileInputStream(f);
HashTree tree = SaveService.loadTree(reader);
ReportGuiPackage.getInstance().setReportPlanFile(f.getAbsolutePath());
@@ -236,6 +237,9 @@
log.error("Failure loading test file", e);
JMeterUtils.reportErrorToUser(e.toString());
}
+ finally{
+ JOrphanUtils.closeQuietly(reader);
+ }
}
}
@@ -304,6 +308,9 @@
System.out.println("Error in NonGUIDriver " +
e.toString());
log.error("", e);
}
+ finally{
+ JOrphanUtils.closeQuietly(reader);
+ }
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
Mon Apr 30 15:13:40 2007
@@ -21,7 +21,6 @@
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.util.HashSet;
import java.util.Set;
@@ -40,6 +39,7 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
import com.thoughtworks.xstream.XStream;
@@ -112,13 +112,7 @@
}
JMeterUtils.reportErrorToUser(msg);
} finally {
- try {
- if (reader != null) {
- reader.close();
- }
- } catch (IOException e1) {
- // ignored
- }
+ JOrphanUtils.closeQuietly(reader);
ReportGuiPackage.getInstance().updateCurrentGui();
ReportGuiPackage.getInstance().getMainFrame().repaint();
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java?view=diff&rev=533867&r1=533866&r2=533867
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
Mon Apr 30 15:13:40 2007
@@ -39,6 +39,7 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
/**
@@ -125,7 +126,7 @@
log.error("", ex);
throw new IllegalUserActionException("Couldn't save
test plan to file: " + updateFile);
} finally {
- closeStream(ostream);
+ JOrphanUtils.closeQuietly(ostream);
}
}
@@ -138,15 +139,4 @@
tree.replace(item, testElement);
}
}
-
- private void closeStream(FileOutputStream fos) {
- if (fos != null) {
- try {
- fos.close();
- } catch (Exception ex) {
- log.error("", ex);
- }
- }
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
