This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch release-1.0.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.0.x by this push:
new a436ba9 fix: JVM trait overrides other traits JVM arguments
a436ba9 is described below
commit a436ba9d6dc0b1106c5afd3f025cf7816d89cbf4
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Mon Jun 15 10:28:51 2020 +0200
fix: JVM trait overrides other traits JVM arguments
---
pkg/trait/jvm.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go
index f7b4acb..e6252a9 100644
--- a/pkg/trait/jvm.go
+++ b/pkg/trait/jvm.go
@@ -113,7 +113,8 @@ func (t *jvmTrait) Apply(e *Environment) error {
}
// Build the container command
- var args []string
+ // Other traits may have already contributed some arguments
+ args := container.Args
// Remote debugging
if t.Debug {
