if value is null don't execute .ToString() and replace {property} with "null"

This commit is contained in:
Emanuele Filardo
2019-10-23 19:09:24 +02:00
parent e51e9797a4
commit 83876bcad2

View File

@ -95,14 +95,7 @@ namespace Oqtane.Infrastructure
names.Add(message.Substring(index + 1, message.IndexOf("}", index) - index - 1)); names.Add(message.Substring(index + 1, message.IndexOf("}", index) - index - 1));
if (values.Length > (names.Count - 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() ?? "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]);
}
} }
} }
index = message.IndexOf("{", index + 1); index = message.IndexOf("{", index + 1);