From 83876bcad22c12c453a832e6f68706d8926ebe93 Mon Sep 17 00:00:00 2001
From: Emanuele Filardo <dev@n4notech.it>
Date: Wed, 23 Oct 2019 19:09:24 +0200
Subject: [PATCH] if value is null don't execute .ToString() and replace
 {property} with "null"

---
 Oqtane.Server/Infrastructure/LogManager.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs
index 47aee78d..e21a571a 100644
--- a/Oqtane.Server/Infrastructure/LogManager.cs
+++ b/Oqtane.Server/Infrastructure/LogManager.cs
@@ -95,14 +95,7 @@ namespace Oqtane.Infrastructure
                         names.Add(message.Substring(index + 1, message.IndexOf("}", index) - index - 1));
                         if (values.Length > (names.Count - 1))
                         {
-                            if (values[names.Count - 1] != null)
-                            {
-                                message = message.Replace("{" + names[names.Count - 1] + "}", names[names.Count - 1] + ":" + values[names.Count - 1].ToString());
-                            }
-                            else
-                            {
-                                message = message.Replace("{" + names[names.Count - 1] + "}", "with Null " + names[names.Count - 1]);
-                            }
+                            message = message.Replace("{" + names[names.Count - 1] + "}", names[names.Count - 1] + ":" + values[names.Count - 1]?.ToString() ?? "null");
                         }
                     }
                     index = message.IndexOf("{", index + 1);