|
Lines 1-7
Link Here
|
| 1 |
--- conf/cassandra-env.sh.orig 2011-11-04 11:47:16.000000000 +0100 |
1 |
--- conf/cassandra-env.sh.orig |
| 2 |
+++ conf/cassandra-env.sh 2011-11-09 16:50:50.124144710 +0100 |
2 |
+++ conf/cassandra-env.sh |
| 3 |
@@ -192,3 +192,4 @@ |
3 |
@@ -90,7 +90,7 @@ |
| 4 |
JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" |
4 |
|
| 5 |
JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false" |
5 |
java_ver_output=`"${JAVA:-java}" -version 2>&1` |
| 6 |
JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false" |
6 |
|
| 7 |
+JVM_OPTS="$JVM_OPTS $JVM_OVERRIDE_OPTS" |
7 |
-jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'` |
|
|
8 |
+jvmver=`echo "$java_ver_output" | egrep 'java version|openjdk version' | awk -F'"' 'NR==1 {print $2}'` |
| 9 |
JVM_VERSION=${jvmver%_*} |
| 10 |
JVM_PATCH_VERSION=${jvmver#*_} |
| 11 |
|