Author: sebb
Date: Tue Feb 23 16:19:22 2010
New Revision: 915408
URL: http://svn.apache.org/viewvc?rev=915408&view=rev
Log:
Bug 48786 - Run Thread groups consecutively: with "Stop test now" on error or
manual stop, JMeter leaves the green box active
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=915408&r1=915407&r2=915408&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:19:22 2010
@@ -352,12 +352,12 @@
public void run() {
running = false;
engine = null;
+ boolean stopped = false;
if (now) {
tellThreadsToStop();
pause(10 * allThreads.size());
- boolean stopped = verifyThreadsStopped();
+ stopped = verifyThreadsStopped();
if (!stopped) {
- notifyTestListenersOfEnd(testListenersSave);
if (JMeter.isNonGUI()) {
exit();
} else {
@@ -369,9 +369,10 @@
} // else will be done by threadFinished()
} else {
stopAllThreads();
- if (serialized) {
- notifyTestListenersOfEnd(testListenersSave);
- }
+ }
+ // for TGs which run consecutively or when thread don't stop
+ if (serialized || !stopped) {
+ notifyTestListenersOfEnd(testListenersSave);
}
}
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=915408&r1=915407&r2=915408&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Feb 23 16:19:22 2010
@@ -104,6 +104,7 @@
<li>Bug 47385 - TransactionController should set AllThreads and
GroupThreads</li>
<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>
</ul>
<h3>Listeners</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
