Skip to content
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

Jump to bottom

SOLR-16721 Java version detection fails when _JAVA_OPTIONS is set #1502

Merged
merged 8 commits into from
Mar 31, 2023
Merged

SOLR-16721 Java version detection fails when _JAVA_OPTIONS is set #1502

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e46a35
SOLR-16721 Java version detection fails when `_JAVA_OPTIONS` is set
janhoy Mar 28, 2023
7277634
review commend to make more robust
janhoy Mar 29, 2023
753fa16
Add Ruoyu Zhong to changes
janhoy Mar 29, 2023
30fb72e
Merge branch 'main' into SOLR-16721
janhoy Mar 29, 2023
ac2b89c
Also remove JAVA_TOOL_OPTIONS line
janhoy Mar 29, 2023
d2b7f3d
Re-introduce head -1
janhoy Mar 31, 2023
4d90aa7
Merge branch 'main' into SOLR-16721
janhoy Mar 31, 2023
cfa65d6
Credit Andy Webb
janhoy Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ Bug Fixes

* SOLR-16638: Fix Http2SolrClient's exception message when serverBaseUrl is null (Alex Deparvu via Kevin Risden)

* SOLR-16721: Java version detection fails when `_JAVA_OPTIONS` is set (janhoy, Ruoyu Zhong)

Dependency Upgrades
---------------------
* PR#1494: Upgrade forbiddenapis to 3.5 (Uwe Schindler)
Expand Down
2 changes: 1 addition & 1 deletion solr/bin/solr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ if [[ $? -ne 0 ]] ; then
echo >&2 "${PATH}"
exit 1
else
JAVA_VER_NUM=$(echo "$JAVA_VER" | head -1 | awk -F '"' '/version/ {print $2}' | sed -e's/^1\.//' | sed -e's/[._-].*$//')
JAVA_VER_NUM=$(echo "$JAVA_VER" | grep -v '_JAVA_OPTIONS' | awk -F '"' '/version/ {print $2}' | sed -e's/^1\.//' | sed -e's/[._-].*$//')
if [[ "$JAVA_VER_NUM" -lt "$JAVA_VER_REQ" ]] ; then
echo >&2 "Your current version of Java is too old to run this version of Solr."
echo >&2 "We found major version $JAVA_VER_NUM, using command '${JAVA} -version', with response:"
Expand Down