Author: sebb
Date: Sun May 13 14:17:14 2007
New Revision: 537660
URL: http://svn.apache.org/viewvc?view=rev&rev=537660
Log:
Bug 40851 - Loop controller with 0 iterations, stops evaluating the iterations
field
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/LoopController.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/LoopController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/LoopController.java?view=diff&rev=537660&r1=537659&r2=537660
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/LoopController.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/LoopController.java
Sun May 13 14:17:14 2007
@@ -78,17 +78,19 @@
return getPropertyAsBoolean(CONTINUE_FOREVER);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.control.Controller#isDone()
- */
- public boolean isDone() {
- if (getLoops() != 0) {
- return super.isDone();
- }
- return true;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.jmeter.control.Controller#next()
+ */
+ public Sampler next() {
+ if(endOfLoop()) {
+ return null;
+ }
+ else {
+ return super.next();
+ }
+ }
private boolean endOfLoop() {
return (getLoops() > -1) && loopCount >= getLoops();
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=537660&r1=537659&r2=537660
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sun May 13 14:17:14 2007
@@ -228,6 +228,7 @@
<li>Bug 42325 - Implement the "clear" method for the LogicControllers</li>
<li>Bug 25441 - TestPlan changes sometimes detected incorrectly (isDirty)</li>
<li>Bug 39734 - Listeners shared after copy/paste operation</li>
+<li>Bug 40851 - Loop controller with 0 iterations, stops evaluating the
iterations field</li>
</ul>
<h3>Version 2.2</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
