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

[astefanutti]

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

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


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

commit 34e7fa07c85378a521f0a7ebc9d285d465a095d4
Author: Antonin Stefanutti <anto...@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 f931c92..c90b172 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
        }