From 5521a4f596a01f7f53faae4d597a1c5a5bbde8f5 Mon Sep 17 00:00:00 2001
From: Vitaliy Dmitriev <v.dmitriev@arenadata.io>
Date: Tue, 20 Jan 2026 14:28:16 +0300
Subject: [PATCH] ADH-7290: unset JAVA_HOME for spark

---
 bin/interpreter.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index cf8501bb3cf..dfcdd38e1e5 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -164,6 +164,11 @@ if [[ ! -d "${ZEPPELIN_LOG_DIR}" ]]; then
   mkdir -p "${ZEPPELIN_LOG_DIR}"
 fi
 
+if [[ "${INTERPRETER_ID}" == "spark" || "${INTERPRETER_ID}" == "spark-submit" ]]; then
+  # JAVA_HOME variable should be set in spark-submit script
+  unset JAVA_HOME
+fi
+
 # set spark related env variables
 if [[ "${INTERPRETER_ID}" == "spark" ]]; then