Author: sebb
Date: Tue Sep 25 05:48:45 2007
New Revision: 579227
URL: http://svn.apache.org/viewvc?rev=579227&view=rev
Log:
Improve error logging if the file is not found
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java?rev=579227&r1=579226&r2=579227&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java Tue
Sep 25 05:48:45 2007
@@ -21,7 +21,10 @@
*/
package org.apache.jmeter.util;
+import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.util.Properties;
import org.apache.jorphan.logging.LoggingManager;
@@ -40,12 +43,16 @@
static {
nameMap = new Properties();
FileInputStream fis = null;
+ File f = new File(JMeterUtils.getJMeterHome(),
+
JMeterUtils.getPropDefault("upgrade_properties", // $NON-NLS-1$
+ "/bin/upgrade.properties")); //
$NON-NLS-1$
try {
- fis = new FileInputStream(JMeterUtils.getJMeterHome()
- +
JMeterUtils.getPropDefault("upgrade_properties", "/bin/upgrade.properties"));
+ fis = new FileInputStream(f);
nameMap.load(fis);
- } catch (Exception e) {
- log.error("Bad upgrade file", e);
+ } catch (FileNotFoundException e) {
+ log.error("Could not find upgrade file: ", e);
+ } catch (IOException e) {
+ log.error("Error processing upgrade file:
"+f.getPath(), e);
} finally {
JOrphanUtils.closeQuietly(fis);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
