fix: null reference on extra elements

donderjoekel · Jan 31, 2024 · f5b5164 · f5b5164
1 parent 3dec778
commit f5b5164
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Mangarr.Stack/Database/Documents/RequestedChapterDocument.cs b/src/Mangarr.Stack/Database/Documents/RequestedChapterDocument.cs
@@ -8,7 +8,7 @@ public class RequestedChapterDocument : DocumentBase<RequestedChapterDocument>,
     public const int CurrentVersion = 1;
 
     // ReSharper disable once FieldCanBeMadeReadOnly.Local
-    [BsonExtraElements] private Dictionary<string, object> _extraElements = null!;
+    [BsonExtraElements] private Dictionary<string, object>? _extraElements;
 
     public required string RequestedMangaId { get; set; }
     public required string ChapterId { get; set; } = null!;
@@ -27,6 +27,11 @@ void ISupportInitialize.BeginInit()
 
     void ISupportInitialize.EndInit()
     {
+        if (_extraElements == null)
+        {
+            return;
+        }
+
         if (!_extraElements.TryGetValue("CreationDate", out object? creationDate))
         {
             return;

diff --git a/src/Mangarr.Stack/Database/Documents/RequestedMangaDocument.cs b/src/Mangarr.Stack/Database/Documents/RequestedMangaDocument.cs
@@ -8,7 +8,7 @@ public class RequestedMangaDocument : DocumentBase<RequestedMangaDocument>, ISup
     public const int CurrentVersion = 1;
 
     // ReSharper disable once FieldCanBeMadeReadOnly.Local
-    [BsonExtraElements] private Dictionary<string, object> _extraElements = null!;
+    [BsonExtraElements] private Dictionary<string, object>? _extraElements;
 
     public required int SearchId { get; set; }
     public required string SourceId { get; set; } = null!;
@@ -26,6 +26,11 @@ void ISupportInitialize.BeginInit()
 
     void ISupportInitialize.EndInit()
     {
+        if (_extraElements == null)
+        {
+            return;
+        }
+
         if (!_extraElements.TryGetValue("CreationDate", out object? creationDate))
         {
             return;