From 442b4aa30424ff1f5db0c5f455ffa89010aadfad Mon Sep 17 00:00:00 2001
From: xYLiuuuuu <liuxiaoyang1115@126.com>
Date: Sat, 26 Oct 2024 22:39:17 +0800
Subject: [PATCH 1/2] fix:ForEach Controller Start index for loop not using
 variable

---
 .../main/java/org/apache/jmeter/control/ForeachController.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java b/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
index d80b94f038c..aed65aecf5e 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
@@ -198,6 +198,9 @@ private boolean endOfArguments() {
     // Prevent entry if nothing to do
     @Override
     public Sampler next() {
+        if (loopCount < getStartIndex()) {
+            loopCount = getStartIndex();
+        }
         updateIterationIndex(getName(), loopCount);
         try {
             if (breakLoop || emptyList()) {

From d7faa57907ff3fbcd5a216adecd4460f6d9c9326 Mon Sep 17 00:00:00 2001
From: xYLiuuuuu <liuxiaoyang1115@126.com>
Date: Tue, 26 Nov 2024 20:59:58 +0800
Subject: [PATCH 2/2] call getStartIndex() once

---
 .../java/org/apache/jmeter/control/ForeachController.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java b/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
index aed65aecf5e..677537c1545 100644
--- a/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
+++ b/src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
@@ -198,8 +198,9 @@ private boolean endOfArguments() {
     // Prevent entry if nothing to do
     @Override
     public Sampler next() {
-        if (loopCount < getStartIndex()) {
-            loopCount = getStartIndex();
+        int startIndex = getStartIndex();
+        if (loopCount < startIndex) {
+            loopCount = startIndex;
         }
         updateIterationIndex(getName(), loopCount);
         try {