From 504d4e8ffdff52d81a8afc4a6f8467698c2d22c1 Mon Sep 17 00:00:00 2001
From: Jan Staelens <jan.staelens@skyline.be>
Date: Tue, 8 Oct 2024 10:47:01 +0200
Subject: [PATCH] Update CICD.Tools.CatalogUpload.Lib/CatalogMetaData.cs

Co-authored-by: Michiel Oda <97458010+MichielOda@users.noreply.github.com>
---
 CICD.Tools.CatalogUpload.Lib/CatalogMetaData.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/CICD.Tools.CatalogUpload.Lib/CatalogMetaData.cs b/CICD.Tools.CatalogUpload.Lib/CatalogMetaData.cs
index 6236bf3..7819edc 100644
--- a/CICD.Tools.CatalogUpload.Lib/CatalogMetaData.cs
+++ b/CICD.Tools.CatalogUpload.Lib/CatalogMetaData.cs
@@ -244,15 +244,9 @@ public bool SearchAndApplyCatalogYaml(IFileSystem fs, string startPath)
 
 				if (!String.IsNullOrWhiteSpace(p.Short_description)) ShortDescription = p.Short_description;
 				if (!String.IsNullOrWhiteSpace(p.Source_code_url)) SourceCodeUri = p.Source_code_url;
-				if (p.Owners != null)
-				{
-					p.Owners.ForEach(o => { Owners.Add(new CatalogOwner() { Name = o.Name, Email = o.Email, Url = o.Url }); });
-				}
 
-				if (p.Tags != null)
-				{
-					p.Tags.ForEach(Tags.Add);
-				}
+				p.Owners?.ForEach(o => { Owners.Add(new CatalogOwner { Name = o.Name, Email = o.Email, Url = o.Url }); });
+				p.Tags?.AddRange(Tags);
 			}
 
 			return true;