sebb 2004/01/21 15:22:23
Modified: src/functions/org/apache/jmeter/functions CSVRead.java
Log:
Handle missing file more gracefully
Revision Changes Path
1.10 +10 -4
jakarta-jmeter/src/functions/org/apache/jmeter/functions/CSVRead.java
Index: CSVRead.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/CSVRead.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CSVRead.java 20 Jan 2004 01:30:06 -0000 1.9
+++ CSVRead.java 21 Jan 2004 23:22:23 -0000 1.10
@@ -55,6 +55,7 @@
package org.apache.jmeter.functions;
import java.io.BufferedReader;
+import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.Serializable;
@@ -181,7 +182,12 @@
try
{
int columnIndex = Integer.parseInt(columnOrNext); // what column is
wanted?
- myValue = (String) processedLines.get(columnIndex);
+ if (processedLines != null) {
+ myValue = (String)
processedLines.get(columnIndex);
+ } else {
+ log.error("No file data found");
+ }
+
}
catch (NumberFormatException e)
{
@@ -299,9 +305,9 @@
FileReader fis = new FileReader(fileName);
myBread = new BufferedReader(fis);
}
- catch (Exception e)
+ catch (FileNotFoundException e)
{
- log.error("openFile", e);
+ log.error(e.toString());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
