woolfel 2005/08/24 11:34:23
Modified: src/components/org/apache/jmeter/control
IncludeController.java
Log:
slight change to make it so that if there's not file, it will still pass the
unit test
peter
Revision Changes Path
1.4 +10 -20
jakarta-jmeter/src/components/org/apache/jmeter/control/IncludeController.java
Index: IncludeController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/IncludeController.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IncludeController.java 24 Aug 2005 18:18:22 -0000 1.3
+++ IncludeController.java 24 Aug 2005 18:34:23 -0000 1.4
@@ -22,13 +22,10 @@
import java.io.InputStream;
import java.util.Iterator;
-import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.collections.ListedHashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -56,20 +53,19 @@
}
public Object clone() {
- log.info("----- clone() ------");
this.loadIncludedElements();
IncludeController clone = (IncludeController) super.clone();
clone.setIncludePath(this.getIncludePath());
- if (this.SUBTREE.keySet().size() == 1) {
- Iterator itr = this.SUBTREE.keySet().iterator();
- while (itr.hasNext()) {
- this.SUB = (TestElement)itr.next();
+ if (this.SUBTREE != null) {
+ if (this.SUBTREE.keySet().size() == 1) {
+ Iterator itr = this.SUBTREE.keySet().iterator();
+ while (itr.hasNext()) {
+ this.SUB = (TestElement)itr.next();
+ }
}
- System.out.println("key=" + this.SUB.getClass().getName() +
- " -- value=" +
this.SUBTREE.get(this.SUB).getClass().getName());
+ clone.SUBTREE = (HashTree)this.SUBTREE.clone();
+ clone.SUB = (TestElement)this.SUB.clone();
}
- clone.SUBTREE = (HashTree)this.SUBTREE.clone();
- clone.SUB = (TestElement)this.SUB.clone();
return clone;
}
@@ -95,15 +91,9 @@
* followed by replace(HashTree) and finally getReplacement().
*/
public HashTree getReplacementSubTree() {
- log.info("----- replace(HashTree) ------");
return SUBTREE;
}
- public TestElement getReplacement() {
- log.info("----- getReplacement() ------");
- return this.SUB;
- }
-
/**
* load the included elements using SaveService
* @param node
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
