summaryrefslogtreecommitdiffstats
path: root/vespabase
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@yahoo-inc.com>2016-06-17 15:44:46 +0200
committerArnstein Ressem <aressem@yahoo-inc.com>2016-06-17 15:44:46 +0200
commitfb43db6ff7a072e573a72b9c56c14039bf7dc42b (patch)
tree40eba8e411cbf05dd709fa248db870559603c89c /vespabase
parent97d76a237c613a1954651ac0c0666db9215cafe2 (diff)
Allow using the 64-bit OpenJDK vm as well.
Diffstat (limited to 'vespabase')
-rwxr-xr-xvespabase/src/common-env.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh
index 3caa875b846..e2e20b9bd8f 100755
--- a/vespabase/src/common-env.sh
+++ b/vespabase/src/common-env.sh
@@ -159,11 +159,11 @@ fixlimits () {
}
checkjava () {
- if java -version 2>&1 | grep "Java HotSpot.* 64-Bit Server VM" >/dev/null ; then
+ if java -version 2>&1 | grep "64-Bit Server VM" >/dev/null ; then
: OK
else
echo
- echo "java must invoke the 64-bit Sun Java VM"
+ echo "java must invoke the 64-bit Java VM"
echo "Got:"
java -version
echo "Path: $PATH"