Author: sebb
Date: Mon Oct 31 00:29:16 2011
New Revision: 1195289
URL: http://svn.apache.org/viewvc?rev=1195289&view=rev
Log:
Fix indentation
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=1195289&r1=1195288&r2=1195289&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
Mon Oct 31 00:29:16 2011
@@ -140,35 +140,35 @@ public class CSVDataSet extends ConfigTe
}
}
- // TODO: fetch this once as per vars above?
- JMeterVariables threadVars = context.getVariables();
- String line = null;
+ // TODO: fetch this once as per vars above?
+ JMeterVariables threadVars = context.getVariables();
+ String line = null;
+ try {
+ line = server.readLine(alias, getRecycle(), firstLineIsNames);
+ } catch (IOException e) { // treat the same as EOF
+ log.error(e.toString());
+ }
+ if (line!=null) {// i.e. not EOF
try {
- line = server.readLine(alias, getRecycle(), firstLineIsNames);
- } catch (IOException e) { // treat the same as EOF
- log.error(e.toString());
- }
- if (line!=null) {// i.e. not EOF
- try {
- String[] lineValues = getQuotedData() ?
- CSVSaveService.csvSplitString(line,
delim.charAt(0))
- : JOrphanUtils.split(line, delim, false);
- for (int a = 0; a < vars.length && a <
lineValues.length; a++) {
- threadVars.put(vars[a], lineValues[a]);
- }
- } catch (IOException e) { // Should only happen for quoting
errors
- log.error("Unexpected error splitting '"+line+"' on
'"+delim.charAt(0)+"'");
- }
- // TODO - report unused columns?
- // TODO - provide option to set unused variables ?
- } else {
- if (getStopThread()) {
- throw new JMeterStopThreadException("End of file
detected");
- }
- for (int a = 0; a < vars.length ; a++) {
- threadVars.put(vars[a], EOFVALUE);
+ String[] lineValues = getQuotedData() ?
+ CSVSaveService.csvSplitString(line, delim.charAt(0))
+ : JOrphanUtils.split(line, delim, false);
+ for (int a = 0; a < vars.length && a < lineValues.length; a++)
{
+ threadVars.put(vars[a], lineValues[a]);
}
+ } catch (IOException e) { // Should only happen for quoting errors
+ log.error("Unexpected error splitting '"+line+"' on
'"+delim.charAt(0)+"'");
}
+ // TODO - report unused columns?
+ // TODO - provide option to set unused variables ?
+ } else {
+ if (getStopThread()) {
+ throw new JMeterStopThreadException("End of file detected");
+ }
+ for (int a = 0; a < vars.length ; a++) {
+ threadVars.put(vars[a], EOFVALUE);
+ }
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
