| commit | e76c2e6eb9954d94557b93560687da1ef225e00e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Onofré <jbonofre@apache.org> | Thu Aug 27 13:56:55 2020 +0200 |
| committer | GitHub <noreply@github.com> | Thu Aug 27 13:56:55 2020 +0200 |
| tree | eabd5126b8d832bb3511d68f0d8be845e6c860e1 | |
| parent | bb8247cd794e0a9323b8886989406682e98349ee [diff] | |
| parent | 8a33ba6b3edef1068539d31c733397a80904cadd [diff] |
Merge pull request #1168 from htreu/inc_java_opts Export JAVA_OPTS after setting EXTRA_JAVA_OPTS
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc index fea17e2..c8f33ec 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc +++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -307,11 +307,11 @@ if [ "x${JAVA_OPTS}" = "x" ]; then JAVA_OPTS="${DEFAULT_JAVA_OPTS}" fi - export JAVA_OPTS if [ "x${EXTRA_JAVA_OPTS}" != "x" ]; then JAVA_OPTS="${JAVA_OPTS} ${EXTRA_JAVA_OPTS}" fi + export JAVA_OPTS ##