Small refactoring.

6 years ago · de5f469ed0
1 changed files with 10 additions and 2 deletions
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@ -314,9 +314,17 @@ namespace Volo.Abp.EntityFrameworkCore
                    continue;
                }

-                var entryProperty = entry.Property(property.Name);
                var entityProperty = entity.GetProperty(property.Name);
-                entryProperty.CurrentValue = Convert.ChangeType(entityProperty, entryProperty.Metadata.ClrType);
+                if (entityProperty == null)
+                {
+                    continue;
+                }
+
+                var entryProperty = entry.Property(property.Name);
+
+                entryProperty.CurrentValue = entryProperty.Metadata.ClrType == entityProperty.GetType()
+                    ? entityProperty
+                    : Convert.ChangeType(entityProperty, entryProperty.Metadata.ClrType);
            }
        }