Author: sebb
Date: Mon Feb 12 15:09:08 2007
New Revision: 506737
URL: http://svn.apache.org/viewvc?view=rev&rev=506737
Log:
Fix some possible file close failures
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/NameUpdater.java
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/io/TextFile.java
jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/NameUpdater.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/NameUpdater.java?view=diff&rev=506737&r1=506736&r2=506737
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/NameUpdater.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/NameUpdater.java
Mon Feb 12 15:09:08 2007
@@ -25,6 +25,7 @@
import java.util.Properties;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
/**
@@ -38,11 +39,15 @@
static {
nameMap = new Properties();
+ FileInputStream fis = null;
try {
- nameMap.load(new
FileInputStream(JMeterUtils.getJMeterHome()
- +
JMeterUtils.getPropDefault("upgrade_properties", "/bin/upgrade.properties")));
+ fis = new FileInputStream(JMeterUtils.getJMeterHome()
+ +
JMeterUtils.getPropDefault("upgrade_properties", "/bin/upgrade.properties"));
+ nameMap.load(fis);
} catch (Exception e) {
log.error("Bad upgrade file", e);
+ } finally {
+ 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=506737&r1=506736&r2=506737
==============================================================================
---
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 Feb 12 15:09:08 2007
@@ -31,6 +31,7 @@
import java.io.Writer;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
/**
@@ -139,13 +140,14 @@
String lineEnd = System.getProperty("line.separator");
//$NON-NLS-1$
StringBuffer sb = new StringBuffer();
Reader reader = null;
+ BufferedReader br = null;
try {
if (encoding == null) {
reader = new FileReader(this);
} else {
reader = new InputStreamReader(new
FileInputStream(this), encoding);
}
- BufferedReader br = new BufferedReader(reader);
+ br = new BufferedReader(reader);
String line = "NOTNULL"; //$NON-NLS-1$
while (line != null) {
line = br.readLine();
@@ -156,11 +158,7 @@
} catch (IOException ioe) {
log.error("", ioe); //$NON-NLS-1$
} finally {
- if (reader != null)
- try {
- reader.close();
- } catch (IOException e) {
- }
+ JOrphanUtils.closeQuietly(br); // closes reader as well
}
return sb.toString();
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java?view=diff&rev=506737&r1=506736&r2=506737
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
Mon Feb 12 15:09:08 2007
@@ -37,6 +37,7 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.ThreadListener;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
/**
@@ -89,14 +90,18 @@
log.debug("Status properties=" + STATUS_PROPERTIES);
if (STATUS_PROPERTIES.length() > 0) {
File f = new File(STATUS_PROPERTIES);
+ FileInputStream fis = null;
try {
- statusProps.load(new FileInputStream(f));
+ fis = new FileInputStream(f);
+ statusProps.load(fis);
log.debug("Successfully loaded properties");
haveStatusProps = true;
} catch (FileNotFoundException e) {
log.debug("Property file not found");
} catch (IOException e) {
log.debug("Property file error " +
e.toString());
+ } finally {
+ JOrphanUtils.closeQuietly(fis);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
