Author: sebb
Date: Fri May 8 13:21:37 2009
New Revision: 772972
URL: http://svn.apache.org/viewvc?rev=772972&view=rev
Log:
Can't reference ModuleController (component) directly from core
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=772972&r1=772971&r2=772972&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Fri May 8
13:21:37 2009
@@ -40,7 +40,6 @@
import org.apache.commons.cli.avalon.CLOption;
import org.apache.commons.cli.avalon.CLOptionDescriptor;
import org.apache.commons.cli.avalon.CLUtil;
-import org.apache.jmeter.control.ModuleController;
import org.apache.jmeter.control.ReplaceableController;
import org.apache.jmeter.engine.ClientJMeterEngine;
import org.apache.jmeter.engine.JMeterEngine;
@@ -801,12 +800,16 @@
if (item.isEnabled()) {
if (item instanceof ReplaceableController) {
ReplaceableController rc;
- if (item instanceof ModuleController){ // Bug 47165
+
+ // TODO this bit of code needs to be tidied up
+ // Unfortunately ModuleController is in components,
not core
+ if
(item.getClass().getName().equals("org.apache.jmeter.control.ModuleController")){
// Bug 47165
rc = (ReplaceableController) item;
} else {
// HACK: force the controller to load its tree
rc = (ReplaceableController) item.clone();
}
+
HashTree subTree = tree.getTree(item);
if (subTree != null) {
HashTree replacementTree =
rc.getReplacementSubTree();
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
