svn commit: r1579084 - in /jmeter/trunk: src/core/org/apache/jmeter/control/LoopController.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Tue Mar 18 23:17:14 2014
New Revision: 1579084

URL: http://svn.apache.org/r1579084
Log:
Bug 56276 - Loop controller becomes broken once loop count evaluates to zero 
Bugzilla Id: 56276

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java?rev=1579084&r1=1579083&r2=1579084&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java Tue Mar 18 23:17:14 2014
@@ -71,7 +71,12 @@ public class LoopController extends Gene
     public int getLoops() {
         // Evaluation occurs when nbLoops is not yet evaluated 
         // or when nbLoops is equal to special value INFINITE_LOOP_COUNT
-        if(nbLoops==null || nbLoops.intValue()==INFINITE_LOOP_COUNT) {
+        if(nbLoops==null || // No evaluated yet
+                nbLoops.intValue()==0 || // Last iteration led to nbLoops == 0, 
+                                         // in this case as resetLoopCount will not be called, 
+                                         // it leads to no further evaluations if we don't evaluate, see BUG 56276
+                nbLoops.intValue()==INFINITE_LOOP_COUNT // Number of iteration is set to infinite
+                ) {
             try {
                 JMeterProperty prop = getProperty(LOOPS);
                 nbLoops = Integer.valueOf(prop.getStringValue());

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1579084&r1=1579083&r2=1579084&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Mar 18 23:17:14 2014
@@ -140,6 +140,7 @@ A workaround is to use a Java 7 update 4
 <h3>Controllers</h3>
 <ul>
 <li><bugzilla>56243</bugzilla> - Foreach works incorrectly with indexes on subsequent iterations </li>
+<li><bugzilla>56276</bugzilla> - Loop controller becomes broken once loop count evaluates to zero </li>
 </ul>
 
 <h3>Listeners</h3>
@@ -175,7 +176,7 @@ A workaround is to use a Java 7 update 4
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
 <li><bugzilla>55959</bugzilla> - improve error message when Test Script Recorder fails due to I/O problem</li>
-<li><bugzilla>52013</bugzilla> - Test Script Recorder's Child View Results Tree does not take into account Test Script Recorder excluded/included URLs. Based on report and analysis of James Liang</li>
+<li><bugzilla>52013</bugzilla> -  Test Script Recorder's Child View Results Tree does not take into account Test Script Recorder excluded/included URLs. Based on report and analysis of James Liang</li>
 <li><bugzilla>56119</bugzilla> - File uploads fail every other attempt using timers. Enable idle timeouts for servers that don't send Keep-Alive headers.</li>
 <li><bugzilla>56272</bugzilla> -  MirrorServer should support query parameters for status and redirects</li>
 </ul>