Merge pull request #1126 from JonHanna/remove_list_array

Remove some unnecessary list and array allocations.
This commit is contained in:
James Newton-King
2017-01-05 11:32:37 +13:00
committed by GitHub
8 changed files with 76 additions and 55 deletions
@@ -659,16 +659,15 @@ namespace Newtonsoft.Json.Utilities
foreach (IGrouping<string, MemberInfo> groupedMember in targetMembers.GroupBy(m => m.Name))
{
int count = groupedMember.Count();
IList<MemberInfo> members = groupedMember.ToList();
if (count == 1)
{
distinctMembers.Add(members.First());
distinctMembers.Add(groupedMember.First());
}
else
{
IList<MemberInfo> resolvedMembers = new List<MemberInfo>();
foreach (MemberInfo memberInfo in members)
foreach (MemberInfo memberInfo in groupedMember)
{
// this is a bit hacky
// if the hiding property is hiding a base property and it is virtual