From df9475086de4c52bd050d7c31088950778dbb672 Mon Sep 17 00:00:00 2001
From: Mick Semb Wever <mck@apache.org>
Date: Wed, 9 May 2018 10:12:41 +1000
Subject: [PATCH] Detect OpenJDK jvm type and architecture

Patch by Stefan Podkowinski; Reviewed by Mick Semb Wever for CASSANDRA-12793
---
 CHANGES.txt           | 1 +
 conf/cassandra-env.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d8d3d6f995..2b7530fe75 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.3
+ * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
  * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271)
  * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
  * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 189576b4f9..89329850a5 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -102,7 +102,7 @@ if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 40 ] ; then
     exit 1;
 fi
 
-jvm=`echo "$java_ver_output" | grep -A 1 'java version' | awk 'NR==2 {print $1}'`
+jvm=`echo "$java_ver_output" | grep -A 1 '[openjdk|java] version' | awk 'NR==2 {print $1}'`
 case "$jvm" in
     OpenJDK)
         JVM_VENDOR=OpenJDK