Skip to content

launcher: support system java when it is a shim #19443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yaauie wants to merge 2 commits into
base: main
Choose a base branch
from
Open

launcher: support system java when it is a shim #19443

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be0fc5a
launcher: support system java when it is a shim
yaauie Aug 20, 2026
bf1b54f
Merge branch 'main' into localdev-jenv-support
yaauie Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions bin/logstash.lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,26 @@ setup_java() {
elif [ -d "${LOGSTASH_HOME}/${BUNDLED_JDK_PART}" -a -x "${LOGSTASH_HOME}/${BUNDLED_JDK_PART}/bin/java" ]; then
echo "Using bundled JDK: ${LOGSTASH_HOME}/${BUNDLED_JDK_PART}"
JAVACMD="${LOGSTASH_HOME}/${BUNDLED_JDK_PART}/bin/java"
elif [ -n "$JAVACMD_TEST" ]; then
set +e
JAVACMD=`command -v java`
set -e
echo "Using system java: $JAVACMD"
elif [ -n "${JAVACMD_TEST}" ]; then
JAVACMD="${JAVACMD_TEST}"
# Resolve JAVACMD to the real JDK binary so that jruby.sh can correctly
# derive JAVA_HOME (it walks two dirname levels up from JAVACMD).
# A real JDK home always contains a release file; if that's missing,
# JAVACMD is a wrapper (symlink, version manager shim, etc.) and we
# interrogate the JVM to locate the underlying binary.
_candidate_home="$(dirname "$(dirname "${JAVACMD}")")"
if [ ! -f "${_candidate_home}/release" ]; then
_java_home="$(${JAVACMD} -XshowSettings:property -version 2>&1 \
| awk -F' = ' '/java\.home/{print $2; exit}')"
[ -x "${_java_home}/bin/java" ] && JAVACMD="${_java_home}/bin/java"
unset _java_home
fi
unset _candidate_home
if [ "${JAVACMD}" = "${JAVACMD_TEST}" ]; then
echo "Using system java: ${JAVACMD}"
else
echo "Using system java: ${JAVACMD_TEST} -> ${JAVACMD}"
fi
fi
fi

Expand Down
Loading