From b2b1b46486ac0f9c3e5293aa1f6a3dd821278f8f Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Fri, 14 Feb 2020 13:16:45 -0600
Subject: [PATCH] Allow EXTRA_CLASSPATH to work on tar/source installations

Patch by brandonwillams, reviewed by David Capwell for CASSANDRA-15567
---
 CHANGES.txt         | 2 +-
 bin/cassandra       | 1 +
 bin/cassandra.in.sh | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 27c2f5bbc4..9ecfcb466a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 2.2.17
- * 
+ * Allow EXTRA_CLASSPATH to work on tar/source installations (CASSANDRA-15567)
 
 2.2.16
  * Fix SELECT JSON output for empty blobs (CASSANDRA-15435)
diff --git a/bin/cassandra b/bin/cassandra
index 0e337e889b..7a1dcbd8e9 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -27,6 +27,7 @@
 # behavior, those variables are:
 #
 #   CLASSPATH -- A Java classpath containing everything necessary to run.
+#   EXTRA_CLASSPATH -- A Java classpath with anything to be appended to CLASSPATH
 #   JVM_OPTS -- Additional arguments to the JVM for heap size, etc
 #   JVM_ON_OUT_OF_MEMORY_ERROR_OPT -- The OnOutOfMemoryError JVM option if specified
 #   CASSANDRA_CONF -- Directory containing Cassandra configuration files.
diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
index 92f79c7d46..13b1291f65 100644
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@ -48,6 +48,9 @@ done
 for jsr223jar in "$CASSANDRA_HOME"/lib/jsr223/*/*.jar; do
     CLASSPATH="$CLASSPATH:$jsr223jar"
 done
+
+CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
+
 # JSR223/JRuby - set ruby lib directory
 if [ -d "$CASSANDRA_HOME"/lib/jsr223/jruby/ruby ] ; then
     export JVM_OPTS="$JVM_OPTS -Djruby.lib=$CASSANDRA_HOME/lib/jsr223/jruby"