Author: pmouawad
Date: Thu Oct 13 20:43:07 2011
New Revision: 1183082
URL: http://svn.apache.org/viewvc?rev=1183082&view=rev
Log:
Bug 52019 - Add menu option to Start a test ignoring Pause Timers
Changed it to make it more extensible and take into account sebb notes
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeClonerNoTimer.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java?rev=1183082&r1=1183081&r2=1183082&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java Thu
Oct 13 20:43:07 2011
@@ -55,7 +55,20 @@ public class TreeCloner implements HashT
this.honourNoThreadClone = honourNoThreadClone;
}
- public void addNode(Object node, HashTree subTree) {
+ /**
+ * @param node
+ * @param subTree {@link HashTree}
+ */
+ public final void addNode(Object node, HashTree subTree) {
+ node = addNodeToTree(node);
+ addLast(node);
+ }
+
+ /**
+ * @param node Node to add to tree or not
+ * @return Object node (clone or not)
+ */
+ protected Object addNodeToTree(Object node) {
if ( (node instanceof TestElement) // Check can cast for clone
// Don't clone NoThreadClone unless honourNoThreadClone == false
&& (!honourNoThreadClone || !(node instanceof NoThreadClone))
@@ -65,14 +78,14 @@ public class TreeCloner implements HashT
} else {
newTree.add(objects, node);
}
- addLast(node);
+ return node;
}
/**
* add node to objects LinkedList
* @param node Object
*/
- protected final void addLast(Object node) {
+ private final void addLast(Object node) {
objects.addLast(node);
}
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=1183082&r1=1183081&r2=1183082&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
Thu Oct 13 20:43:07 2011
@@ -19,7 +19,6 @@
package org.apache.jmeter.engine;
import org.apache.jmeter.timers.Timer;
-import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -44,16 +43,18 @@ public class TreeClonerNoTimer extends T
}
/**
- * {@inheritDoc}
+ * Doesn't add Timer to tree
+ * @see org.apache.jmeter.engine.TreeCloner#addNodeToTree(java.lang.Object)
*/
- public void addNode(Object node, HashTree subTree) {
+ @Override
+ protected Object addNodeToTree(Object node) {
if(!(node instanceof Timer)) {
- super.addNode(node, subTree);
+ return super.addNodeToTree(node);
} else {
if(logger.isDebugEnabled()) {
logger.debug("Ignoring timer node:"+ node);
}
- addLast(node);
+ return node;
}
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
