Merge pull request #520 from Jeavon/U4-5698

Fix for U4-5698 - EntityService.GetObjectType throws for deleted Id's
This commit is contained in:
Shannon Deminick
2014-11-18 17:15:12 +11:00

View File

@@ -562,7 +562,14 @@ namespace Umbraco.Core.Persistence
{
object val = cmd.ExecuteScalarWithRetry();
OnExecutedCommand(cmd);
return (T)Convert.ChangeType(val, typeof(T));
if (val == null || val == DBNull.Value)
return default(T);
Type t = typeof(T);
Type u = Nullable.GetUnderlyingType(t);
return (T)Convert.ChangeType(val, u ?? t);
}
}
finally