Merge 515d06c601 into 77675e0b8e

src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java

@@ -442,7 +442,6 @@ public class ArgumentsPanel extends AbstractConfigGui implements ActionListener
         int[] rowsSelected = table.getSelectedRows();
         GuiUtils.stopTableEditing(table);
         int selectedRowsCount = rowsSelected.length;
-
         if (selectedRowsCount > 0 && rowsSelected[selectedRowsCount - 1] < table.getRowCount() - 1) {
             table.clearSelection();
             for (int i = selectedRowsCount - 1; i >= 0; i--) {

src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java

@@ -203,8 +203,7 @@ public class TestCompiler implements HashTreeTraverser {
         List<Assertion> assertions = new ArrayList<>();
         List<PostProcessor> posts = new ArrayList<>();
         List<PreProcessor> pres = new ArrayList<>();
-        int stackSize = stack.size();
+        for (int i = stack.size(); i > 0; i--) {
-        for (int i = stackSize; i > 0; i--) {
             addDirectParentControllers(controllers, stack.get(i - 1));
             List<PreProcessor>  tempPre = new ArrayList<>();
             List<PostProcessor> tempPost = new ArrayList<>();
@@ -249,8 +248,7 @@ public class TestCompiler implements HashTreeTraverser {
         List<Assertion> assertions = new ArrayList<>();
         List<PostProcessor> posts = new ArrayList<>();
         List<PreProcessor> pres = new ArrayList<>();
-        int stackSize = stack.size();
+        for (int i = stack.size(); i > 0; i--) {
-        for (int i = stackSize; i > 0; i--) {
             addDirectParentControllers(controllers, stack.get(i - 1));
             for (Object item : testTree.list(stack.subList(0, i))) {
                 if (item instanceof SampleListener) {