Author: sebb
Date: Mon Feb 12 15:10:49 2007
New Revision: 506738
URL: http://svn.apache.org/viewvc?view=rev&rev=506738
Log:
Extract filename once
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/config/CSVDataSet.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/config/CSVDataSet.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/config/CSVDataSet.java?view=diff&rev=506738&r1=506737&r2=506738
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/config/CSVDataSet.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/config/CSVDataSet.java
Mon Feb 12 15:10:49 2007
@@ -64,8 +64,9 @@
*/
public void iterationStart(LoopIterationEvent iterEvent) {
FileServer server = FileServer.getFileServer();
+ String _fileName = getFilename();
if (vars == null) {
- server.reserveFile(getFilename());
+ server.reserveFile(_fileName);
vars = JOrphanUtils.split(getVariableNames(), ","); //
$NON-NLS-1$
}
try {
@@ -73,7 +74,7 @@
if (delim.equals("\\t")) // $NON-NLS-1$
delim = "\t";// Make it easier to enter a Tab
// $NON-NLS-1$
JMeterVariables threadVars =
this.getThreadContext().getVariables();
- String line =
server.readLine(getFilename(),getRecycle());
+ String line = server.readLine(_fileName,getRecycle());
if (line!=null) {// i.e. not EOF
String[] lineValues = JOrphanUtils.split(line, delim,false);
for (int a = 0; a < vars.length && a <
lineValues.length; a++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
