summaryrefslogtreecommitdiffstats
path: root/standalone-container
diff options
context:
space:
mode:
Diffstat (limited to 'standalone-container')
-rwxr-xr-xstandalone-container/src/main/sh/standalone-container.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index ca9507ae14b..a2304621845 100755
--- a/standalone-container/src/main/sh/standalone-container.sh
+++ b/standalone-container/src/main/sh/standalone-container.sh
@@ -137,6 +137,10 @@ StartCommand() {
cd "$VESPA_HOME" || Fail "Cannot cd to $VESPA_HOME"
fixlimits
+
+ # If JAVA_HOME is set in the environment, the sourcing of common-env.sh
+ # elsewhere in this file ensures $JAVA_HOME/bin is first in PATH, so 'java'
+ # may be invoked w/o path. In any case, checkjava verifies bare 'java'.
checkjava
FixDataDirectory "$(dirname "$pidfile")"