Author: sebb
Date: Fri Oct 14 01:40:42 2011
New Revision: 1183194
URL: http://svn.apache.org/viewvc?rev=1183194&view=rev
Log:
Simplify by using positive conditions
"We don't want no negative conditions"
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeClonerNoTimer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeClonerNoTimer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeClonerNoTimer.java?rev=1183194&r1=1183193&r2=1183194&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeClonerNoTimer.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeClonerNoTimer.java
Fri Oct 14 01:40:42 2011
@@ -42,13 +42,13 @@ public class TreeClonerNoTimer extends T
*/
@Override
protected Object addNodeToTree(Object node) {
- if(!(node instanceof Timer)) {
- return super.addNodeToTree(node);
- } else {
+ if(node instanceof Timer) {
if(logger.isDebugEnabled()) {
logger.debug("Ignoring timer node:"+ node);
}
- return node;
+ return node; // don't add the timer
+ } else {
+ return super.addNodeToTree(node);
}
}
}
\ No newline at end of file
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java?rev=1183194&r1=1183193&r2=1183194&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java Fri
Oct 14 01:40:42 2011
@@ -122,10 +122,10 @@ public class Start extends AbstractActio
*/
private TreeCloner cloneTree(HashTree testTree, boolean removeTimers) {
TreeCloner cloner = null;
- if(!removeTimers) {
- cloner = new TreeCloner(false);
- } else {
+ if(removeTimers) {
cloner = new TreeClonerNoTimer(false);
+ } else {
+ cloner = new TreeCloner(false);
}
testTree.traverse(cloner);
return cloner;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
