Author: sebb
Date: Sun Feb 11 12:36:01 2007
New Revision: 506124
URL: http://svn.apache.org/viewvc?view=rev&rev=506124
Log:
Ensure file is closed; remove useless instance of Properties()
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java?view=diff&rev=506124&r1=506123&r2=506124
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
Sun Feb 11 12:36:01 2007
@@ -46,6 +46,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;
@@ -140,15 +141,20 @@
public static Properties loadProperties() throws IOException{
Properties nameMap = new Properties();
- nameMap.load(new FileInputStream(JMeterUtils.getJMeterHome()
- + JMeterUtils.getPropDefault(SAVESERVICE_PROPERTIES,
SAVESERVICE_PROPERTIES_FILE)));
- return nameMap;
+ FileInputStream fis = null;
+ try {
+ fis = new FileInputStream(JMeterUtils.getJMeterHome()
+ +
JMeterUtils.getPropDefault(SAVESERVICE_PROPERTIES,
SAVESERVICE_PROPERTIES_FILE));
+ nameMap.load(fis);
+ } finally {
+ JOrphanUtils.closeQuietly(fis);
+ }
+ return nameMap;
}
private static void initProps() {
// Load the alias properties
- Properties nameMap = new Properties();
try {
- nameMap = loadProperties();
+ Properties nameMap = loadProperties();
// now create the aliases
Iterator it = nameMap.entrySet().iterator();
while (it.hasNext()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
