svn commit: r603780 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java

[sebb]

Author: sebb
Date: Wed Dec 12 16:07:06 2007
New Revision: 603780

URL: http://svn.apache.org/viewvc?rev=603780&view=rev
Log:
Recent change to set Loop Controller name from ThreadGroup name did not work

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java?rev=603780&r1=603779&r2=603780&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java 
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java 
Wed Dec 12 16:07:06 2007
@@ -34,6 +34,7 @@
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.IntegerProperty;
+import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.LongProperty;
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.TestElementProperty;
@@ -244,8 +245,6 @@
         */
        public Controller getSamplerController() {
                Controller c = (Controller) 
getProperty(MAIN_CONTROLLER).getObjectValue();
-               c.setName(getName()); // Copy our name into that of the 
controller
-               // Could perhaps do it earlier, but that might cause JMX files 
to change
                return c;
        }
 
@@ -421,7 +420,11 @@
         * @see Controller#initialize()
         */
        public void initialize() {
-               getSamplerController().initialize();
+               Controller c = getSamplerController();
+               JMeterProperty property = c.getProperty(TestElement.NAME);
+               property.setObjectValue(getName()); // Copy our name into that 
of the controller
+               property.setRunningVersion(property.isRunningVersion());// 
otherwise name reverts
+               c.initialize();
        }
 
        /**



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]