Author: pmouawad
Date: Wed Dec 7 21:52:39 2011
New Revision: 1211656
URL: http://svn.apache.org/viewvc?rev=1211656&view=rev
Log:
Bug 52296 - TransactionController with Child ThrouputController : Getting ERROR
sampleEnd called twice java.lang.Throwable: Invalid call sequence when TPC does
not run sample
Modified:
jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=1211656&r1=1211655&r2=1211656&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
Wed Dec 7 21:52:39 2011
@@ -167,10 +167,9 @@ public class TransactionController exten
prevEndTime = res.getStartTime();//???
pauseTime = 0;
}
-
+ boolean isLast = current==super.subControllersAndSamplers.size();
Sampler returnValue = super.next();
- // FIXME Broken code in case of subController that may return null
(Interleave, ThroughputController, testing nullity is not enough
- if (returnValue == null) // Must be the end of the controller
+ if (returnValue == null && isLast) // Must be the end of the controller
{
if (res != null) {
res.setIdleTime(pauseTime+res.getIdleTime());
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1211656&r1=1211655&r2=1211656&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed Dec 7 21:52:39 2011
@@ -113,6 +113,7 @@ This behaviour can be changed with prope
<li>Bug 51865 - Infinite loop inside thread group does not work properly if
"Start next loop after a Sample error" option set</li>
<li>Bug 51868 - A lot of exceptions in jmeter.log while using option "Start
next loop" for thread</li>
<li>Bug 51866 - Counter under loop doesn't work properly if "Start next loop
on error" option set for thread group</li>
+<li>TransactionController with Child ThrouputController : Getting ERROR
sampleEnd called twice java.lang.Throwable: Invalid call sequence when TPC does
not run sample</li>
</ul>
<h3>Listeners</h3>
