.Net 10

Author: phongnguyend

src/EntityFrameworkCore.SqlServer.SimpleBulks/PropertiesCache.cs

@@ -283,19 +283,24 @@ public static object GetFlattenedPropertyValueOptimized(string name, T item)
 
     public static object GetPropertyValue(string propName, T item, IReadOnlyDictionary<string, ValueConverter> valueConverters)
     {
+        var value = GetPropertyValueOptimized(propName, item);
+
         if (valueConverters != null && valueConverters.TryGetValue(propName, out var converter))
         {
             if (converter is JsonValueConverter jsonValueConverter)
             {
+                if (value == null)
+                {
+                    return null;
+                }
+
                 return JsonPropertyWriter.Write(item, jsonValueConverter.FlattenedJsonProperties);
             }
 
-            var value = GetPropertyValueOptimized(propName, item);
-
             return converter.ConvertToProvider(value);
         }
 
-        return GetPropertyValueOptimized(propName, item);
+        return value;
     }
 
     public static void SetPropertyValueReflection(string name, T item, object value)