Author: sebb
Date: Mon May 21 02:11:02 2012
New Revision: 1340884
URL: http://svn.apache.org/viewvc?rev=1340884&view=rev
Log:
Bug 50898 - IncludeController : NullPointerException loading script in non-GUI
mode if Includers use same element name
Modified:
jmeter/trunk/build.xml
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1340884&r1=1340883&r2=1340884&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Mon May 21 02:11:02 2012
@@ -2212,11 +2212,9 @@ run JMeter unless all the JMeter jars ar
<param name="batchtest.name" value="Bug52968"/>
</antcall>
- <!-- TODO fix bug so test passes
<antcall target="batchtest">
<param name="batchtest.name" value="Bug50898"/>
</antcall>
- -->
</target>
<!-- Run all batch tests; used by test target -->
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1340884&r1=1340883&r2=1340884&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
Mon May 21 02:11:02 2012
@@ -63,6 +63,13 @@ public class IncludeController extends G
super();
}
+ // Bug 50898 - work round the problem just for Include Controllers for now.
+ // Can be removed if the AbstractTestElement#equals(Object o) method is
fixed.
+ @Override
+ public boolean equals(Object obj) {
+ return this == obj;
+ }
+
@Override
public Object clone() {
// TODO - fix so that this is only called once per test, instead of at
every clone
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1340884&r1=1340883&r2=1340884&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon May 21 02:11:02 2012
@@ -130,12 +130,6 @@ New interface org.apache.jmeter.engine.u
<h2>Known bugs</h2>
-<p>
-The Include Controller has some problems in non-GUI mode (see Bug 50898).
-In particular, it can cause a NullPointerException if there are two include
controllers with the same name.
-The workaround is to use different names for IncludeControllers
-</p>
-
<p>The Once Only controller behaves correctly under a Thread Group or Loop
Controller,
but otherwise its behaviour is not consistent (or clearly specified).</p>
@@ -200,6 +194,7 @@ When calling "Clear All" command, if Log
<h3>Controllers</h3>
<ul>
<li>Bug 52968 - Option Start Next Loop in Thread Group does not mark parent
Transaction Sampler in error when an error occurs</li>
+<li>Bug 50898 - IncludeController : NullPointerException loading script in
non-GUI mode if Includers use same element name</li>
</ul>
<h3>Listeners</h3>
