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/01/10 16:04:54 UTC
[karaf] branch karaf-4.2.x updated: KARAF-5628: Corrupt gc.log due
to unseparated VM settings
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 467eebf KARAF-5628: Corrupt gc.log due to unseparated VM settings
467eebf is described below
commit 467eebf84439ee457e6d04d2ed5ab84fbc592c95
Author: Julien Greffe <jg...@talend.com>
AuthorDate: Fri Jan 10 16:59:41 2020 +0100
KARAF-5628: Corrupt gc.log due to unseparated VM settings
Remove useless parameters on stop
(cherry picked from commit 696bbe9ddc78e3227668504d5dd9bba79342190f)
---
.../features/base/src/main/filtered-resources/resources/bin/karaf | 4 ++++
.../features/base/src/main/filtered-resources/resources/bin/karaf.bat | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index e51bb8d..e5fca26 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -224,6 +224,10 @@ run() {
'stop')
MAIN=org.apache.karaf.main.Stop
CHECK_ROOT_INSTANCE_RUNNING=false
+ # not needed when stopping
+ JAVA_OPTS=
+ KARAF_SYSTEM_OPTS=
+ KARAF_OPTS=
nodebug=true
shift
;;
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
index 2ebf45d..70ea51f 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -346,6 +346,10 @@ if "%KARAF_PROFILER%" == "" goto :RUN
:EXECUTE_STOP
SET MAIN=org.apache.karaf.main.Stop
SET CHECK_ROOT_INSTANCE_RUNNING=false
+ rem not needed when stopping
+ SET JAVA_OPTS=
+ SET KARAF_SYSTEM_OPTS=
+ SET KARAF_OPTS=
shift
goto :RUN_LOOP