svn commit: r915421 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/engine/StandardJMeterEngine.java xdocs/changes.xml

Author: sebb
Date: Tue Feb 23 16:39:03 2010
New Revision: 915421

URL: http://svn.apache.org/viewvc?rev=915421&view=rev
Log:
Bug 48727 - Cannot stop test if all thread groups are disabled

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=915421&r1=915420&r2=915421&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Tue Feb 23 16:39:03 2010
@@ -496,12 +496,17 @@
                 }
             }
         } // end of thread groups
-        if (running) {
-            log.info("All threads have been started");
+        startingGroups = false;
+        if (groupCount == 0){ // No TGs found
+            log.info("No enabled thread groups found");
+            notifyTestListenersOfEnd(testListenersSave);
         } else {
-            log.info("Test stopped - no more threads will be started");
+            if (running) {
+                log.info("All threads have been started");
+            } else {
+                log.info("Test stopped - no more threads will be started");
+            }
         }
-        startingGroups = false;
     }
 
     /**

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=915421&r1=915420&r2=915421&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Feb 23 16:39:03 2010
@@ -105,6 +105,7 @@
 <li>Bug 47940 - Module controller incorrectly creates the replacement Sub Tree</li>
 <li>Bug 47592 - Run Thread groups consecutively with "Stop test" on error, JMeter will not mark to finished</li>
 <li>Bug 48786 - Run Thread groups consecutively: with "Stop test now" on error or manual stop, JMeter leaves the green box active</li>
+<li>Bug 48727 - Cannot stop test if all thread groups are disabled</li>
 </ul>
 
 <h3>Listeners</h3>