svn commit: r1845917 - /jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

[pm...@apache.org]

Author: pmouawad
Date: Tue Nov  6 13:39:15 2018
New Revision: 1845917

URL: http://svn.apache.org/viewvc?rev=1845917&view=rev
Log:
Bug 62806 ModuleController cloning by Run behaves differently wether in GUI or Non GUI mode.
Reinstate old method signature to avoid NoSuchMethodError in calling plugins and deprecate it
Bugzilla Id: 62806

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1845917&r1=1845916&r2=1845917&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Tue Nov  6 13:39:15 2018
@@ -1086,12 +1086,13 @@ public class JMeter implements JMeterPlu
      * <li>Clone the tree to ensure Commonly referenced NoThreadClone elements are cloned</li>
      * </ul>
      * @param tree The {@link HashTree} to convert
-     * @return HashTree the output {@link HashTree} to use
+     * @deprecated This method does not correctly handle a tree with Replaceable controllers that contain NoThreadClone element. Use {@link JMeter#convertSubTree(HashTree, boolean)}
      */
-    public static HashTree convertSubTree(HashTree tree) {
-        return convertSubTree(tree, true);
+    @Deprecated
+    public static void convertSubTree(HashTree tree) {
+        convertSubTree(tree, false);
     }
-    
+
     /**
      * This function does the following:
      * <ul>
@@ -1099,7 +1100,7 @@ public class JMeter implements JMeterPlu
      * <li>Replace the ReplaceableController with the target subtree</li>
      * <li>If cloneAtEnd is true : Clone the tree to ensure Commonly referenced NoThreadClone elements are cloned</li>
      * </ul>
-     * THIS IS INTERNAL JMETER API and should not be used
+     * THIS IS INTERNAL JMETER API and should be used with care
      * @param tree The {@link HashTree} to convert
      * @param cloneAtEnd  boolean wether we clone the tree at end
      * @return HashTree the output {@link HashTree} to use