Browse Source

Update ExtraPropertiesValueConverter.cs

pull/6114/head
Halil İbrahim Kalkan 6 years ago
parent
commit
b65884bc22
  1. 6
      framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs

6
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs

@ -42,10 +42,16 @@ namespace Volo.Abp.EntityFrameworkCore.ValueConverters
private static ExtraPropertyDictionary DeserializeObject(string extraPropertiesAsJson, Type entityType) private static ExtraPropertyDictionary DeserializeObject(string extraPropertiesAsJson, Type entityType)
{ {
if (extraPropertiesAsJson.IsNullOrEmpty() || extraPropertiesAsJson == "{}")
{
return new ExtraPropertyDictionary();
}
var deserializeOptions = new JsonSerializerOptions(); var deserializeOptions = new JsonSerializerOptions();
deserializeOptions.Converters.Add(new ObjectToInferredTypesConverter()); deserializeOptions.Converters.Add(new ObjectToInferredTypesConverter());
var dictionary = JsonSerializer.Deserialize<ExtraPropertyDictionary>(extraPropertiesAsJson, deserializeOptions) ?? var dictionary = JsonSerializer.Deserialize<ExtraPropertyDictionary>(extraPropertiesAsJson, deserializeOptions) ??
new ExtraPropertyDictionary(); new ExtraPropertyDictionary();
if (entityType != null) if (entityType != null)
{ {
var objectExtension = ObjectExtensionManager.Instance.GetOrNull(entityType); var objectExtension = ObjectExtensionManager.Instance.GetOrNull(entityType);

Loading…
Cancel
Save