[karaf] branch karaf-4.2.x updated: [KARAF-6535] in bin/client script JAVA_OPTS are never populated to default values

[jb...@apache.org]

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 8302fa7  [KARAF-6535] in bin/client script JAVA_OPTS are never populated to default values
8302fa7 is described below

commit 8302fa7f45112af717134da1a7def298efa77beb
Author: Aleksandar Vasilev <a....@seeburger.com>
AuthorDate: Fri Nov 29 13:20:45 2019 +0200

    [KARAF-6535] in bin/client script JAVA_OPTS are never populated to default values
    
    (cherry picked from commit cf5278c1e4a8a0cc85d7509ca40cace3a428f667)
---
 .../base/src/main/filtered-resources/resources/bin/inc | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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 f32a990..a197498 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -250,14 +250,6 @@ checkJvmVersion() {
 }
 
 setupDebugOptions() {
-    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
 
     # Set Debug options if enabled
     if [ "x${KARAF_DEBUG}" != "x" ]; then
@@ -312,6 +304,16 @@ setupDefaults() {
     DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUG_PORT}"
     DEFAULT_JAVA_DEBUGS_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=${JAVA_DEBUG_PORT}"
 
+    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
+
+
     ##
     ## TODO: Move to conf/profiler/yourkit.{sh|cmd}
     ##