[karaf] branch master updated: Export JAVA_OPTS after setting EXTRA_JAVA_OPTS

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 8a33ba6  Export JAVA_OPTS after setting EXTRA_JAVA_OPTS
     new e76c2e6  Merge pull request #1168 from htreu/inc_java_opts
8a33ba6 is described below

commit 8a33ba6b3edef1068539d31c733397a80904cadd
Author: Henning Treu <henning.t...@instana.com>
AuthorDate: Wed Aug 26 14:16:46 2020 +0200

    Export JAVA_OPTS after setting EXTRA_JAVA_OPTS
---
 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 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 @@ 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
 
 
     ##