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 2015/12/14 21:17:52 UTC
svn commit: r1720002 - in /jmeter/trunk/src:
components/org/apache/jmeter/control/
components/org/apache/jmeter/control/gui/ core/org/apache/jmeter/control/
Author: pmouawad
Date: Mon Dec 14 20:17:52 2015
New Revision: 1720002
URL: http://svn.apache.org/viewvc?rev=1720002&view=rev
Log:
add explanations
remove commented code
#resolve #60
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java?rev=1720002&r1=1720001&r2=1720002&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java Mon Dec 14 20:17:52 2015
@@ -106,7 +106,6 @@ public class ModuleController extends Ge
for (TreeNode node : path) {
nodePath.add(((JMeterTreeNode) node).getName());
}
- // nodePath.add(selectedNode.getName());
}
setProperty(new CollectionProperty(NODE_PATH, nodePath));
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java?rev=1720002&r1=1720001&r2=1720002&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java Mon Dec 14 20:17:52 2015
@@ -199,7 +199,6 @@ public class ForeachControlPanel extends
* @return a GUI panel containing the loop count components
*/
private JPanel createLoopCountPanel() {
- // JPanel loopPanel = new JPanel(new BorderLayout(5, 0));
VerticalPanel loopPanel = new VerticalPanel();
// LOOP LABEL
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java?rev=1720002&r1=1720001&r2=1720002&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java Mon Dec 14 20:17:52 2015
@@ -30,7 +30,6 @@ import org.apache.jmeter.util.JMeterUtil
import org.apache.jorphan.gui.layout.VerticalLayout;
public class IncludeControllerGui extends AbstractControllerGui
- // implements UnsharedComponent
{
private static final long serialVersionUID = 240L;
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java?rev=1720002&r1=1720001&r2=1720002&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java Mon Dec 14 20:17:52 2015
@@ -83,9 +83,6 @@ public class IfController extends Generi
private static final ThreadLocal<ScriptEngine> NASHORN_ENGINE = new ThreadLocal<ScriptEngine>() {
- /* (non-Javadoc)
- * @see java.lang.ThreadLocal#initialValue()
- */
@Override
protected ScriptEngine initialValue() {
return getInstance().getEngineByName("nashorn");//$NON-NLS-N$
@@ -200,10 +197,10 @@ public class IfController extends Generi
boolean result;
switch(resultStr) {
case "false":
- result=false;
+ result = false;
break;
case "true":
- result=true;
+ result = true;
break;
default:
throw new Exception(" BAD CONDITION :: " + condition + " :: expected true or false");
@@ -219,22 +216,12 @@ public class IfController extends Generi
return cond.equalsIgnoreCase("true"); // $NON-NLS-1$
}
- /**
- * This is overriding the parent method. IsDone indicates whether the
- * termination condition is reached. I.e. if the condition evaluates to
- * False - then isDone() returns TRUE
- */
@Override
public boolean isDone() {
- // boolean result = true;
- // try {
- // result = !evaluateCondition();
- // } catch (Exception e) {
- // logger.error(e.getMessage(), e);
- // }
- // setDone(true);
- // return result;
- // setDone(false);
+ // bug 26672 : the isDone result should always be false and not based on the expession evaluation
+ // if an IfController ever gets evaluated to false it gets removed from the test tree.
+ // The problem is that the condition might get evaluated to true the next iteration,
+ // which we don't get the opportunity for
return false;
}
@@ -291,10 +278,10 @@ public class IfController extends Generi
public void setUseExpression(boolean selected) {
setProperty(USE_EXPRESSION, selected, false);
}
+
@Override
- public void threadStarted() {
-
- }
+ public void threadStarted() {}
+
@Override
public void threadFinished() {
NASHORN_ENGINE.remove();