[karaf] branch karaf-4.2.x updated: [KARAF-6887] Remove default JAVA_MAX_MEM JAVA_MIN_MEM settings from bin/inc

[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 98055bd  [KARAF-6887] Remove default JAVA_MAX_MEM JAVA_MIN_MEM settings from bin/inc
     new a5be7ac  Merge pull request #1226 from mattrpav/KARAF-6887
98055bd is described below

commit 98055bdc88a39b66493c0cbb0a2f8b86affb77a9
Author: Matt Pavlovich <ma...@hyte.io>
AuthorDate: Thu Oct 15 08:37:35 2020 -0500

    [KARAF-6887] Remove default JAVA_MAX_MEM JAVA_MIN_MEM settings from bin/inc
---
 .../base/src/main/filtered-resources/resources/bin/inc      | 13 +------------
 1 file changed, 1 insertion(+), 12 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 ee007ab..44164de8b 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -279,19 +279,8 @@ setupVendorSepcifics() {
 }
 
 setupDefaults() {
-    #
-    # Set up some easily accessible MIN/MAX params for JVM mem usage
-    #
-    if [ "x${JAVA_MIN_MEM}" = "x" ]; then
-        JAVA_MIN_MEM=128M
-        export JAVA_MIN_MEM
-    fi
-    if [ "x${JAVA_MAX_MEM}" = "x" ]; then
-        JAVA_MAX_MEM=512M
-        export JAVA_MAX_MEM
-    fi
 
-    DEFAULT_JAVA_OPTS="-Xms${JAVA_MIN_MEM} -Xmx${JAVA_MAX_MEM} -XX:+UnlockDiagnosticVMOptions "
+    DEFAULT_JAVA_OPTS="-XX:+UnlockDiagnosticVMOptions "
 
     setupVendorSepcifics