[camel-k] branch release-1.7.x updated: fix: Camel Catalog generation fails with empty Maven effective settings

[as...@apache.org]

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

astefanutti pushed a commit to branch release-1.7.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/release-1.7.x by this push:
     new 06ba2b8  fix: Camel Catalog generation fails with empty Maven effective settings
06ba2b8 is described below

commit 06ba2b84ba34ab420f2ad3e338c0e9067f595075
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Mon Jan 24 14:16:47 2022 +0100

    fix: Camel Catalog generation fails with empty Maven effective settings
---
 pkg/util/camel/catalog.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index eb8b1a4..9bcfe77 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -123,10 +123,10 @@ func GenerateCatalogCommon(
 	mc.AddSystemProperty("catalog.file", "catalog.yaml")
 	mc.AddSystemProperty("catalog.runtime", string(runtime.Provider))
 
-	if globalSettings != nil {
+	if len(globalSettings) > 0 {
 		mc.GlobalSettings = globalSettings
 	}
-	if userSettings != nil {
+	if len(userSettings) > 0 {
 		mc.UserSettings = userSettings
 	}