You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2014/10/26 14:18:19 UTC

svn commit: r1634323 - in /jmeter/trunk: src/core/org/apache/jmeter/control/TransactionController.java xdocs/changes.xml

Author: pmouawad
Date: Sun Oct 26 13:18:18 2014
New Revision: 1634323

URL: http://svn.apache.org/r1634323
Log:
Bug 56811 - "Start Next Thread Loop" in Result Status Action Handler or on Thread Group and "Go to next Loop iteration" in Test Action behave incorrectly with TransactionController that has "Generate Parent Sampler" checked
Bugzilla Id: 56811

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=1634323&r1=1634322&r2=1634323&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java Sun Oct 26 13:18:18 2014
@@ -232,6 +232,17 @@ public class TransactionController exten
                 notifyListeners();
             }
         } else {
+            Sampler subSampler = transactionSampler.getSubSampler();
+            // See Bug 56811
+            // triggerEndOfLoop is called when error occurs to end Main Loop
+            // in this case normal workflow doesn't happen, so we need 
+            // to notify the childs of TransactionController and 
+            // update them with SubSamplerResult
+            if(subSampler instanceof TransactionSampler) {
+                TransactionSampler tc = (TransactionSampler) subSampler;
+                tc.getTransactionController().triggerEndOfLoop();
+                transactionSampler.addSubSamplerResult(tc.getTransactionResult());
+            }
             transactionSampler.setTransactionDone();
             // This transaction is done
             transactionSampler = null;

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1634323&r1=1634322&r2=1634323&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Oct 26 13:18:18 2014
@@ -239,6 +239,7 @@ for details on configuring this componen
 <li><bugzilla>56243</bugzilla> - Foreach works incorrectly with indexes on subsequent iterations </li>
 <li><bugzilla>56276</bugzilla> - Loop controller becomes broken once loop count evaluates to zero </li>
 <li><bugzilla>56160</bugzilla> - StackOverflowError when using WhileController within IfController</li>
+<li><bugzilla>56811</bugzilla> - "Start Next Thread Loop" in Result Status Action Handler or on Thread Group and "Go to next Loop iteration" in Test Action behave incorrectly with TransactionController that has "Generate Parent Sampler" checked</li>
 </ul>
 
 <h3>Listeners</h3>