Skip to content

Commit

Permalink
Fixes #8152: restore reading JAVA_OPTIONS in script.sh (#8153)
Browse files Browse the repository at this point in the history
Co-authored-by: Francois @fanf42 Armand <francois.armand@normation.com>
  • Loading branch information
fanf and fanf committed Jun 22, 2022
1 parent 64d12e2 commit 2dfbea1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion jetty-home/src/main/resources/bin/jetty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ case "`uname`" in
CYGWIN*) JETTY_START="`cygpath -w $JETTY_START`";;
esac

RUN_ARGS=$("$JAVA" -jar "$JETTY_START" --dry-run=opts,path,main,args ${JETTY_ARGS[*]})
RUN_ARGS=$("$JAVA" -jar "$JETTY_START" --dry-run=opts,path,main,args ${JETTY_ARGS[*]} ${JAVA_OPTIONS[*]})
RUN_CMD=("$JAVA" $JETTY_SYS_PROPS ${RUN_ARGS[@]})

#####################################################
Expand Down

0 comments on commit 2dfbea1

Please sign in to comment.