svn commit: r1418661 - in /jmeter/trunk: src/core/org/apache/jmeter/threads/JMeterThread.java src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Sat Dec  8 12:41:53 2012
New Revision: 1418661

URL: http://svn.apache.org/viewvc?rev=1418661&view=rev
Log:
Bug 54267 - Start Next Thread Loop setting doesn't work in custom thread groups
Bugzilla Id: 54267

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1418661&r1=1418660&r2=1418661&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Sat Dec  8 12:41:53 2012
@@ -337,8 +337,8 @@ public class JMeterThread implements Run
         for (Iterator<Controller> iterator = controllersToReinit
                 .iterator(); iterator.hasNext();) {
             Controller parentController =  iterator.next();
-            if(parentController instanceof ThreadGroup) {
-                ThreadGroup tg = (ThreadGroup) parentController;
+            if(parentController instanceof AbstractThreadGroup) {
+                AbstractThreadGroup tg = (AbstractThreadGroup) parentController;
                 tg.startNextLoop();
             } else {
                 parentController.triggerEndOfLoop();

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java?rev=1418661&r1=1418660&r2=1418661&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java Sat Dec  8 12:41:53 2012
@@ -95,8 +95,8 @@ public class ThreadGroupGui extends Abst
     @Override
     public void modifyTestElement(TestElement tg) {
         super.configureTestElement(tg);
-        if (tg instanceof ThreadGroup) {
-            ((ThreadGroup) tg).setSamplerController((LoopController) loopPanel.createTestElement());
+        if (tg instanceof AbstractThreadGroup) {
+            ((AbstractThreadGroup) tg).setSamplerController((LoopController) loopPanel.createTestElement());
         }
 
         tg.setProperty(AbstractThreadGroup.NUM_THREADS, threadInput.getText());

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1418661&r1=1418660&r2=1418661&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Dec  8 12:41:53 2012
@@ -155,6 +155,7 @@ and right angle bracket (&gt;) in search
 <li><bugzilla>54023</bugzilla> - Unable to start JMeter from a root directory and if the full path of JMeter installation contains one or more spaces (Unix/linux)</li>
 <li><bugzilla>54172</bugzilla> - Duplicate shortcut key not working and CTRL+C / CTRL+V / CTRL+V do not cancel default event</li>
 <li><bugzilla>54057</bugzilla> - Proxy option to set user and password at startup (-u and -a) not working with HTTPClient 4</li>
+<li><bugzilla>54267</bugzilla> - Start Next Thread Loop setting doesn't work in custom thread groups</li>
 </ul>
 
 <!-- =================== Improvements =================== -->