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/17 19:35:27 UTC
svn commit: r1812446 - in /jmeter/trunk:
src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
xdocs/changes.xml
Author: pmouawad
Date: Tue Oct 17 19:35:27 2017
New Revision: 1812446
URL: http://svn.apache.org/viewvc?rev=1812446&view=rev
Log:
Bug 61629 - Add Think Times to Children menu should not consider disabled elements
Bugzilla Id: 61629
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java?rev=1812446&r1=1812445&r2=1812446&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java Tue Oct 17 19:35:27 2017
@@ -86,20 +86,17 @@ public class AddThinkTimeBetweenEachStep
private void addThinkTimeToChildren(GuiPackage guiPackage,
JMeterTreeNode parentNode) throws IllegalUserActionException {
guiPackage.updateCurrentNode();
- boolean insertThinkTime = false;
+ boolean insertThinkTime;
try {
int index = 0;
while(true) {
if(index == parentNode.getChildCount()) {
- index++;
break;
}
JMeterTreeNode childNode = (JMeterTreeNode) parentNode.getChildAt(index);
Object userObject = childNode.getUserObject();
- if(userObject instanceof Sampler ||
- userObject instanceof Controller) {
- insertThinkTime = true;
- }
+ insertThinkTime = childNode.isEnabled()
+ && (userObject instanceof Sampler || userObject instanceof Controller);
if(insertThinkTime) {
JMeterTreeNode[] nodes = createThinkTime(guiPackage, parentNode);
if(nodes.length != 2) {
@@ -107,7 +104,6 @@ public class AddThinkTimeBetweenEachStep
}
index++;
addNodesToTreeHierachically(guiPackage, parentNode, nodes, index);
- insertThinkTime = false;
}
index++;
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1812446&r1=1812445&r2=1812446&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Oct 17 19:35:27 2017
@@ -103,7 +103,6 @@ Summary
<ul>
<li><bug>61561</bug>Function helper dialog should display exception in result</li>
<li><bug>61593</bug>Remove Detail, Add, Add from Clipboard, Delete buttons in Function Helper GUI</li>
- <li><bug>61628</bug>If split string has empty separator default separator is not used </li>
</ul>
<h3>I18N</h3>
@@ -122,6 +121,7 @@ Summary
<li><bug>61529</bug>Migration to Java 9. Partly contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
<li><bug>61607</bug>Add browse button in all beanshell elements to select beanshell script</li>
<li><bug>61627</bug>Don't clear LogView anymore when clicking on Warning/Errors Indicator</li>
+ <li><bug>61629</bug>Add Think Times to Children menu should not consider disabled elements</li>
</ul>
<ch_section>Non-functional changes</ch_section>
@@ -159,6 +159,7 @@ Summary
<ul>
<li><bug>61588</bug>Better log message for RandomDate function</li>
<li><bug>61619</bug>In Function Helper Dialog, the 1st function doesn't display default parameters</li>
+ <li><bug>61628</bug>If split string has empty separator default separator is not used</li>
</ul>
<h3>I18N</h3>