Make nullability asssumptions explicit in VertragsConverter

Hochfrequenz · Aug 18, 2024 · 87aea60 · 87aea60
1 parent 6f36e91
commit 87aea60
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/BO4E/BO/Vertrag.cs b/BO4E/BO/Vertrag.cs
@@ -9,6 +9,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text.Json;
@@ -251,15 +252,19 @@ public override Vertrag Read(ref Utf8JsonReader reader, Type typeToConvert, Json
         }
 
         var v = JsonSerializer.Deserialize<Vertrag>(ref reader, Vertrag.VertragsSerializerOptions);
+        if (v is null)
+        {
+            throw new InvalidDataException("Could not deserialize Vertrag");
+        }
         if ((v.Vertragsteile == null || v.Vertragsteile.Count == 0) && v.UserProperties != null &&
-            v.UserProperties.ContainsKey("lokationsId"))
+            v.UserProperties.TryGetValue("lokationsId", out var property))
             v.Vertragsteile = new List<Vertragsteil>
             {
                 new()
                 {
                     Vertragsteilbeginn = v.Vertragsbeginn,
                     Vertragsteilende = v.Vertragsende,
-                    Lokation = ((JsonElement) v.UserProperties["lokationsId"]).GetString()
+                    Lokation = ((JsonElement) property).GetString()
                 }
             };
         return v;