You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/10/30 21:33:54 UTC
svn commit: r1813832 - in /jmeter/trunk:
src/components/org/apache/jmeter/sampler/TestAction.java xdocs/changes.xml
Author: pmouawad
Date: Mon Oct 30 21:33:54 2017
New Revision: 1813832
URL: http://svn.apache.org/viewvc?rev=1813832&view=rev
Log:
Bug 61698 - Test Action: It stop is selected, samplers following Test Action can run
Bugzilla Id: 61698
Modified:
jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=1813832&r1=1813831&r2=1813832&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Mon Oct 30 21:33:54 2017
@@ -85,24 +85,26 @@ public class TestAction extends Abstract
int action = getAction();
if (action == PAUSE) {
pause(getDurationAsString());
- } else if (action == STOP || action == STOP_NOW || action == RESTART_NEXT_LOOP) {
+ } else if (action == STOP || action == STOP_NOW) {
if (target == THREAD) {
- if(action == STOP || action == STOP_NOW) {
- log.info("Stopping current thread from element {}", getName());
- context.getThread().stop();
- } else {
- log.info("Restarting next loop from element {}", getName());
- context.setRestartNextLoop(true);
- }
+ log.info("Stopping current thread from element {}", getName());
+ context.getThread().stop();
} else if (target == TEST) {
if (action == STOP_NOW) {
+ log.info("Stopping current thread from element {}", getName());
+ context.getThread().stop();
log.info("Stopping all threads now from element {}", getName());
context.getEngine().stopTest();
} else {
+ log.info("Stopping current thread from element {}", getName());
+ context.getThread().stop();
log.info("Stopping all threads from element {}", getName());
context.getEngine().askThreadsToStop();
}
}
+ } else if (action == RESTART_NEXT_LOOP) {
+ log.info("Restarting next loop from element {}", getName());
+ context.setRestartNextLoop(true);
}
return null; // This means no sample is saved
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1813832&r1=1813831&r2=1813832&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon Oct 30 21:33:54 2017
@@ -166,6 +166,7 @@ Summary
<h3>Other Samplers</h3>
<ul>
+ <li><bug>61698</bug>Test Action: It stop is selected, samplers following Test Action can run</li>
</ul>
<h3>Controllers</h3>