Merge pull request #1132 from JonHanna/favour_as_over_is

Replace is-and-cast with as-and-nullcheck
This commit is contained in:
James Newton-King
2017-01-05 17:00:42 +13:00
committed by GitHub
16 changed files with 136 additions and 109 deletions
@@ -1320,7 +1320,8 @@ namespace Newtonsoft.Json.Serialization
}
JsonConverter dictionaryValueConverter = contract.ItemConverter ?? GetConverter(contract.ItemContract, null, contract, containerProperty);
PrimitiveTypeCode keyTypeCode = (contract.KeyContract is JsonPrimitiveContract) ? ((JsonPrimitiveContract)contract.KeyContract).TypeCode : PrimitiveTypeCode.Empty;
JsonPrimitiveContract keyContract = contract.KeyContract as JsonPrimitiveContract;
PrimitiveTypeCode keyTypeCode = (keyContract != null) ? keyContract.TypeCode : PrimitiveTypeCode.Empty;
bool finished = false;
do