#397 - Support for null complex objects in json composite storages.

maraf · Jul 6, 2021 · aaa38a4 · aaa38a4
1 parent 92bdf8d
commit aaa38a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Money.Api.Shared/Services/Formatters/SystemJsonCompositeStorage.cs b/src/Money.Api.Shared/Services/Formatters/SystemJsonCompositeStorage.cs
@@ -183,6 +183,11 @@ public bool TryGet<T>(string key, out T value)
                 }
 
                 JsonElement element = (JsonElement)target;
+                if (element.ValueKind == JsonValueKind.Null)
+                {
+                    value = default(T);
+                    return true;
+                }
 
                 if (typeof(T) == typeof(string))
                 {

diff --git a/src/Neptuo.Json/Formatters/Converters/JsonObjectConverter.cs b/src/Neptuo.Json/Formatters/Converters/JsonObjectConverter.cs
@@ -27,6 +27,12 @@ public bool TryConvert(Type sourceType, Type targetType, object sourceValue, out
 
         private bool TryConvertFromJson(Type targetType, JToken sourceValue, out object targetValue)
         {
+            if (sourceValue.Type == JTokenType.Null)
+            {
+                targetValue = null;
+                return true;
+            }
+
             targetValue = JsonConvert.DeserializeObject(sourceValue.ToString(), targetType);
             return targetValue != null;
         }