Merge pull request #2 from appunni-m/main

Merge Netflix#3880 fix
appunni-old · Dec 4, 2023 · dd00723 · dd00723
2 parents 884a9fe + dec43ea
commit dd00723
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/common/src/main/java/com/netflix/conductor/common/utils/TaskUtils.java b/common/src/main/java/com/netflix/conductor/common/utils/TaskUtils.java
@@ -29,9 +29,24 @@ public static String getLoopOverTaskRefNameSuffix(int iteration) {
     public static String removeIterationFromTaskRefName(String referenceTaskName) {
         String[] tokens = referenceTaskName.split(TaskUtils.LOOP_TASK_DELIMITER);
         int length = tokens.length;
-        return length > 1 ? String.join(
-                TaskUtils.LOOP_TASK_DELIMITER,
-                Arrays.copyOf(tokens, length - 1)
-        ) : referenceTaskName;
+
+        // Check if the last element is an integer
+        if (length > 1 && isInteger(tokens[length - 1])) {
+            // Join all elements except the last one
+            return String.join(TaskUtils.LOOP_TASK_DELIMITER, Arrays.copyOf(tokens, length - 1));
+        } else {
+            // No integer at the end, return the original string
+            return referenceTaskName;
+        }
+    }
+
+    // Helper method to check if a string is an integer
+    private static boolean isInteger(String s) {
+        try {
+            Integer.parseInt(s);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
     }
 }