Fix deserialize via ctor with some existing collection types (#2151)

This commit is contained in:
James Newton-King
2019-09-08 20:46:20 +12:00
committed by GitHub
parent c5f2103470
commit a213bac448
2 changed files with 34 additions and 4 deletions
@@ -2079,12 +2079,19 @@ namespace Newtonsoft.Json.Serialization
object? createdObjectCollection = property.ValueProvider!.GetValue(createdObject);
if (createdObjectCollection != null)
{
IList createdObjectCollectionWrapper = (propertyArrayContract.ShouldCreateWrapper) ? propertyArrayContract.CreateWrapper(createdObjectCollection) : (IList)createdObjectCollection;
IList newValues = (propertyArrayContract.ShouldCreateWrapper) ? propertyArrayContract.CreateWrapper(value) : (IList)value;
propertyArrayContract = (JsonArrayContract)GetContract(createdObjectCollection.GetType());
foreach (object newValue in newValues)
IList createdObjectCollectionWrapper = (propertyArrayContract.ShouldCreateWrapper) ? propertyArrayContract.CreateWrapper(createdObjectCollection) : (IList)createdObjectCollection;
// Don't attempt to populate array/read-only list
if (!createdObjectCollectionWrapper.IsFixedSize)
{
createdObjectCollectionWrapper.Add(newValue);
IList newValues = (propertyArrayContract.ShouldCreateWrapper) ? propertyArrayContract.CreateWrapper(value) : (IList)value;
foreach (object newValue in newValues)
{
createdObjectCollectionWrapper.Add(newValue);
}
}
}
}