From 75ddf76801a7b603f9da5fcee0dc72bacc5843c6 Mon Sep 17 00:00:00 2001
From: Angelo Polo <polo.language@gmail.com>
Date: Fri, 16 Jul 2021 07:54:35 -0500
Subject: [PATCH] Ensure java executable is on the path.

Patch by Angelo Polo; reviewed by Aleksei Zotov, brandonwilliams and
edimitrova for CASSANDRA-14325
---
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 bin/debug-cql | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index be040fc1dd..37a516cd2f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.25:
+ * Ensure java executable is on the path (CASSANDRA-14325)
  * Make speculative retry parameter case-insensitive for backward compatibility with 2.1 (CASSANDRA-16467)
  * Push digest mismatch exceptions to trace (CASSANDRA-14900)
  * Support long names in nodetool output (CASSANDRA-14162)
diff --git a/bin/cassandra b/bin/cassandra
index f887b31f5f..d7cfbd7289 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -98,7 +98,7 @@ if [ -n "$JAVA_HOME" ]; then
         fi
     done
 else
-    JAVA=java
+    JAVA=`command -v java 2> /dev/null`
 fi
 
 if [ -z $JAVA ] ; then
diff --git a/bin/debug-cql b/bin/debug-cql
index 00d4093b04..b4991fd264 100755
--- a/bin/debug-cql
+++ b/bin/debug-cql
@@ -36,7 +36,7 @@ fi
 if [ -n "$JAVA_HOME" ]; then
     JAVA="$JAVA_HOME/bin/java"
 else
-    JAVA=java
+    JAVA=`command -v java 2> /dev/null`
 fi
 
 if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then