root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Bug 41612 - Loop nested in IF behaves erratically 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@551743 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 9f6087b9bf
This commit is contained in:
Sebastian Bazley 2007-06-29 00:30:51 +00:00
parent 8e68024c2c
commit a8334008ff
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/org/apache/jmeter/control/IfController.java
View File

@ -137,16 +137,18 @@ public class IfController extends GenericController implements Serializable {
}
/**
* @see org.apache.jmeter.control.Controller#next() 'JMeterThread' iterates
* thru the Controller by calling this method. IF a valid 'Sampler' is
* returned, then it executes the sampler (calls sampler.sampler(xxx)
* method) . So here we make sure that the samplers belonging to this
* Controller do not get called - if isDone is true - if its the first
* time this is run. The first time is special cause it is called prior
* the iteration even starts !
* @see org.apache.jmeter.control.Controller#next()
*/
public Sampler next() {
boolean result = evaluateCondition(getCondition());
// We should only evalute the condition if it is the first
// time ( first "iteration" ) we are called.
// For subsequent calls, we are inside the IfControllerGroup,
// so then we just pass the control to the next item inside the if control
boolean result = true;
if(isFirst()) {
result = evaluateCondition(getCondition());
}
if (result) {
return super.next();
}
@ -156,4 +158,4 @@ public class IfController extends GenericController implements Serializable {
return null;
}
}
}
}

1
xdocs/changes.xml
View File

@ -263,6 +263,7 @@ Removed deprecated method JMeterUtils.split() - use JOrphanUtils version instead
<li>Function methods setParameters() need to be synchronized</li>
<li>Fix CLI long optional argument to require "=" (as for short options)</li>
<li>Fix SlowSocket to work properly with Httpclient (both http and https)</li>
<li>Bug 41612 - Loop nested in IF behaves erratically</li>
</ul>
<h3>Version 2.2</h3>