Author: sebb
Date: Fri Dec 10 17:07:08 2010
New Revision: 1044442
URL: http://svn.apache.org/viewvc?rev=1044442&view=rev
Log:
Findbugs: Ensure stream is closed
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java?rev=1044442&r1=1044441&r2=1044442&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
Fri Dec 10 17:07:08 2010
@@ -40,6 +40,7 @@ import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.security.auth.x500.X500Principal;
+import org.apache.commons.io.IOUtils;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -226,9 +227,14 @@ class SMIMEAssertion {
if (testElement.isSignerCheckByFile()) {
CertificateFactory cf = CertificateFactory
.getInstance("X.509");
- X509Certificate certFromFile = (X509Certificate) cf
- .generateCertificate(new FileInputStream(
- testElement.getSignerCertFile()));
+ X509Certificate certFromFile;
+ FileInputStream inStream = null;
+ try {
+ inStream = new
FileInputStream(testElement.getSignerCertFile());
+ certFromFile = (X509Certificate)
cf.generateCertificate(inStream);
+ } finally {
+ IOUtils.closeQuietly(inStream);
+ }
if (!certFromFile.equals(cert)) {
res.setFailure(true);
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java?rev=1044442&r1=1044441&r2=1044442&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java Fri
Dec 10 17:07:08 2010
@@ -30,6 +30,7 @@ import org.apache.commons.cli.avalon.CLA
import org.apache.commons.cli.avalon.CLOption;
import org.apache.commons.cli.avalon.CLOptionDescriptor;
import org.apache.commons.cli.avalon.CLUtil;
+import org.apache.commons.io.IOUtils;
import org.apache.jmeter.config.gui.AbstractConfigGui;
import org.apache.jmeter.control.gui.ReportGui;
import org.apache.jmeter.gui.ReportGuiPackage;
@@ -354,12 +355,16 @@ public class JMeterReport implements JMe
switch (option.getDescriptor().getId()) {
case PROPFILE2_OPT: // Bug 33920 - allow multiple props
File f = new File(name);
+ FileInputStream inStream = null;
try {
- jmeterProps.load(new FileInputStream(f));
+ inStream = new FileInputStream(f);
+ jmeterProps.load(inStream);
} catch (FileNotFoundException e) {
log.warn("Can't find additional property file: " + name,
e);
} catch (IOException e) {
log.warn("Error loading additional property file: " +
name, e);
+ } finally {
+ IOUtils.closeQuietly(inStream);
}
break;
case SYSTEM_PROPERTY:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
