Repository: nifi Updated Branches: refs/heads/master 9ee2316ff -> a19134f32
NIFI-5350 Add a way to provide arbitrary Java options in shell scripts Signed-off-by: Mike Moser <mose...@apache.org> This closes #2823 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a19134f3 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a19134f3 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a19134f3 Branch: refs/heads/master Commit: a19134f32560ae044cb898a7654ada31338e20c2 Parents: 9ee2316 Author: Lars Francke <lars.fran...@gmail.com> Authored: Thu Jun 28 23:22:49 2018 +0200 Committer: Mike Moser <mose...@apache.org> Committed: Mon Aug 6 21:02:29 2018 +0000 ---------------------------------------------------------------------- .../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/a19134f3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh index eaf4e1a..0d8db06 100755 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh @@ -308,7 +308,7 @@ run() { BOOTSTRAP_DIR_PARAMS="${BOOTSTRAP_LOG_PARAMS} ${BOOTSTRAP_PID_PARAMS} ${BOOTSTRAP_CONF_PARAMS}" - run_nifi_cmd="'${JAVA}' -cp '${BOOTSTRAP_CLASSPATH}' -Xms12m -Xmx24m ${BOOTSTRAP_DIR_PARAMS} ${BOOTSTRAP_DEBUG_PARAMS} org.apache.nifi.bootstrap.RunNiFi $@" + run_nifi_cmd="'${JAVA}' -cp '${BOOTSTRAP_CLASSPATH}' -Xms12m -Xmx24m ${BOOTSTRAP_DIR_PARAMS} ${BOOTSTRAP_DEBUG_PARAMS} ${BOOTSTRAP_JAVA_OPTS} org.apache.nifi.bootstrap.RunNiFi $@" if [ -n "${run_as_user}" ]; then # Provide SCRIPT_DIR and execute nifi-env for the run.as user command