Author: sebb
Date: Thu May 7 23:53:22 2009
New Revision: 772819
URL: http://svn.apache.org/viewvc?rev=772819&view=rev
Log:
Bug 47165 - Using the same module name in command line mode causes NPE
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/xdocs/changes.xml
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=772819&r1=772818&r2=772819&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Thu May 7
23:53:22 2009
@@ -40,6 +40,7 @@
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;
@@ -799,8 +800,13 @@
TestElement item = (TestElement) o;
if (item.isEnabled()) {
if (item instanceof ReplaceableController) {
- // HACK: force the controller to load its tree
- ReplaceableController rc = (ReplaceableController)
item.clone();
+ ReplaceableController rc;
+ if (item instanceof 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();
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=772819&r1=772818&r2=772819&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu May 7 23:53:22 2009
@@ -211,6 +211,7 @@
<li>Bug 47137 - Labels in View Results Tree aren't I18N</li>
<li>Bug 47150 - ThreadGroup with a loop count of zero causes infinite loop</li>
<li>A reference to a missing function - e.g. ${__missing(a)} - is now treated
the same as a missing variable. Previously the function name - and leading { -
were dropped.</li>
+<li>Bug 47165 - Using the same module name in command line mode causes NPE</li>
</ul>
<h3>Improvements</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
