jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1520936 - /jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
Date Sun, 08 Sep 2013 21:51:43 GMT
Author: pmouawad
Date: Sun Sep  8 21:51:42 2013
New Revision: 1520936

URL: http://svn.apache.org/r1520936
Log:
Bug 55464 - Include Controller running included thread group
Bugzilla Id: 55464

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1520936&r1=1520935&r2=1520936&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java Sun Sep 
8 21:51:42 2013
@@ -173,6 +173,11 @@ public class IncludeController extends G
         return tree;
     }
 
+    /**
+     * Extract from tree (included test plan) all Test Elements located in a Test Fragment
+     * @param tree HashTree included Test Plan
+     * @return HashTree Subset within Test Fragment or Empty HashTree
+     */
     private HashTree getProperBranch(HashTree tree) {
         Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator();
         while (iter.hasNext()) {
@@ -189,9 +194,8 @@ public class IncludeController extends G
                 return tree.getTree(item);
             }
         }
-        //return the tree since we didn't find a TestFragment.  This will mimic the 
-        //old behavior to import an exact node.
-        return tree;
+        log.warn("No Test Fragment was found in included Test Plan, returning empty HashTree");
+        return new HashTree();
     }
 
 



Mime
View raw message