You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2009/02/03 02:29:49 UTC

svn commit: r740181 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java

Author: sebb
Date: Tue Feb  3 01:29:49 2009
New Revision: 740181

URL: http://svn.apache.org/viewvc?rev=740181&view=rev
Log:
Use utility method rather than duplicating code

Modified:
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java?rev=740181&r1=740180&r2=740181&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java Tue Feb  3 01:29:49 2009
@@ -18,9 +18,7 @@
 
 package org.apache.jmeter.config;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.StringReader;
 
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.engine.event.LoopIterationEvent;
@@ -135,8 +133,9 @@
             String line = server.readLine(alias,getRecycle());
             if (line!=null) {// i.e. not EOF
                 String[] lineValues = getQuotedData() ?
-                        CSVSaveService.csvReadFile(new BufferedReader(new StringReader(line)), delim.charAt(0))
+                        CSVSaveService.csvSplitString(line, delim.charAt(0))
                         : JOrphanUtils.split(line, delim, false);
+               System.out.println(line+ " count "+lineValues.length+ " vars "+vars.length);
                 for (int a = 0; a < vars.length && a < lineValues.length; a++) {
                     threadVars.put(vars[a], lineValues[a]);
                 }



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org