From 4840ccafee4f2ba6eb03792d6497376d253535e0 Mon Sep 17 00:00:00 2001
From: Sakthivel Subramanian
 <179120858+sakthivelmanii@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:23:55 +0000
Subject: [PATCH 1/2] chore(kokoro): fix IFS bug causing VM timeouts on
 java8-osx

Fixes a Bash 3.2 bug on macOS runners where unset IFS causes mvn to hang.
---
 .kokoro/common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index 84e36200685f..37c75a7676e3 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -57,7 +57,7 @@ function retry_with_backoff {
 
   # allow a failures to continue
   set +e
-  unset IFS
+  IFS=$' \t\n'
   "${command[@]}"
   exit_code=$?
 
@@ -596,7 +596,7 @@ function install_modules() {
     # Join dependencies into comma-delimited string without subshell:
     local IFS=,
     always_install_deps="${always_install_deps_list[*]}"
-    unset IFS
+    IFS=$' \t\n'
     printf "with always_install_deps:\n%s\n" "$all_submodules,$always_install_deps"
 
     # When working with a maven multi-module project containing other multi-module projects,

From e8da79be2cbc9067179f3c08d1f914b67c52f873 Mon Sep 17 00:00:00 2001
From: Sakthivel Subramanian
 <179120858+sakthivelmanii@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:26:50 +0000
Subject: [PATCH 2/2] Addressed comments

---
 .kokoro/common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index 37c75a7676e3..f89f8f0945a7 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -57,7 +57,7 @@ function retry_with_backoff {
 
   # allow a failures to continue
   set +e
-  IFS=$' \t\n'
+  local IFS=$' \t\n'
   "${command[@]}"
   exit_code=$?
 
@@ -596,7 +596,7 @@ function install_modules() {
     # Join dependencies into comma-delimited string without subshell:
     local IFS=,
     always_install_deps="${always_install_deps_list[*]}"
-    IFS=$' \t\n'
+    local IFS=$' \t\n'
     printf "with always_install_deps:\n%s\n" "$all_submodules,$always_install_deps"
 
     # When working with a maven multi-module project containing other multi-module projects,