Changed XML back to empty string to prevent null exception in contain…

…s filtering
microsoft · Oct 24, 2024 · 973ab83 · 973ab83
1 parent 6684c58
commit 973ab83
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/EventLogExpert.Eventing/Models/DisplayEventModel.cs b/src/EventLogExpert.Eventing/Models/DisplayEventModel.cs
@@ -37,5 +37,5 @@ public sealed record DisplayEventModel(
 
     public SecurityIdentifier UserId { get; init; } = new(WellKnownSidType.NullSid, null);
 
-    public string? Xml { get; init; }
+    public string Xml { get; init; } = string.Empty;
 }
diff --git a/src/EventLogExpert.UI/Store/EventLog/EventLogEffects.cs b/src/EventLogExpert.UI/Store/EventLog/EventLogEffects.cs
@@ -212,7 +212,7 @@ await Parallel.ForEachAsync(
                                         ThreadId = @event.ThreadId,
                                         TimeCreated = @event.TimeCreated!.Value.ToUniversalTime(),
                                         UserId = @event.UserId,
-                                        Xml = settingsState.Value.Config.IsXmlEnabled ? @event.ToXml() : null
+                                        Xml = settingsState.Value.Config.IsXmlEnabled ? @event.ToXml() : string.Empty
                                     });
                             }
                             catch (Exception ex) when (ex is EventLogInvalidDataException)

diff --git a/src/EventLogExpert.UI/Store/EventLog/LiveLogWatcherService.cs b/src/EventLogExpert.UI/Store/EventLog/LiveLogWatcherService.cs
@@ -192,7 +192,7 @@ private void StartWatching(string logName)
                                 ThreadId = eventArgs.EventRecord.ThreadId,
                                 TimeCreated = eventArgs.EventRecord.TimeCreated!.Value.ToUniversalTime(),
                                 UserId = eventArgs.EventRecord.UserId,
-                                Xml = _settingsState.Value.Config.IsXmlEnabled ? eventArgs.EventRecord.ToXml() : null
+                                Xml = _settingsState.Value.Config.IsXmlEnabled ? eventArgs.EventRecord.ToXml() : string.Empty
                             }));
                 }
             };