You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/08/27 11:57:50 UTC
[karaf] branch karaf-4.2.x updated: Export JAVA_OPTS after setting
EXTRA_JAVA_OPTS
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 6394977 Export JAVA_OPTS after setting EXTRA_JAVA_OPTS
6394977 is described below
commit 63949772c728be95b0e4197186138e6632addd4c
Author: Henning Treu <he...@instana.com>
AuthorDate: Wed Aug 26 14:16:46 2020 +0200
Export JAVA_OPTS after setting EXTRA_JAVA_OPTS
(cherry picked from commit 8a33ba6b3edef1068539d31c733397a80904cadd)
---
assemblies/features/base/src/main/filtered-resources/resources/bin/inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 a197498..ee007ab 100755
--- 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 @@ setupDefaults() {
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
##