LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Code cleanup

Browse Source
This commit is contained in:
James Newton-King
2014-06-15 21:02:35 +12:00
parent c987b0509a
commit 6b08fbc2fa
10 changed files with 34 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs
+8 -10
View File
@@ -57,7 +57,6 @@ namespace Newtonsoft.Json.Serialization
/// <value><c>true</c> if the collection type is a multidimensional array; otherwise, <c>false</c>.</value>
public bool IsMultidimensionalArray { get; private set; }
private readonly bool _isCollectionItemTypeNullableType;
private readonly Type _genericCollectionDefinitionType;
private Type _genericWrapperType;
@@ -182,17 +181,16 @@ namespace Newtonsoft.Json.Serialization
CanDeserialize = canDeserialize;
if (CollectionItemType != null)
_isCollectionItemTypeNullableType = ReflectionUtils.IsNullableType(CollectionItemType);
#if (NET20 || NET35)
// bug in .NET 2.0 & 3.5 that List<Nullable<T>> throws an error when adding null via IList.Add(object)
// wrapper will handle calling Add(T) instead
if (_isCollectionItemTypeNullableType
&& (ReflectionUtils.InheritsGenericDefinition(CreatedType, typeof(List<>), out tempCollectionType)
|| (IsArray && !IsMultidimensionalArray)))
if (CollectionItemType != null && ReflectionUtils.IsNullableType(CollectionItemType))
{
ShouldCreateWrapper = true;
// bug in .NET 2.0 & 3.5 that List<Nullable<T>> throws an error when adding null via IList.Add(object)
// wrapper will handle calling Add(T) instead
if (ReflectionUtils.InheritsGenericDefinition(CreatedType, typeof(List<>), out tempCollectionType)
|| (IsArray && !IsMultidimensionalArray))
{
ShouldCreateWrapper = true;
}
}
#endif