[camel-k] branch release-1.8.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.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git


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

commit 52530cc8df8fd71e093a5ad2868a3052ac9c8941
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 20cdea5..a873993 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -125,10 +125,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
                }