Merge pull request #309 from hultqvist/master

Extracting converter assignment
This commit is contained in:
James Newton-King
2014-06-22 14:35:02 +12:00
@@ -141,14 +141,15 @@ namespace Newtonsoft.Json.Serialization
return; return;
} }
JsonConverter converter; JsonConverter converter =
if ((((converter = (member != null) ? member.Converter : null) != null) ((member != null) ? member.Converter : null) ??
|| ((converter = (containerProperty != null) ? containerProperty.ItemConverter : null) != null) ((containerProperty != null) ? containerProperty.ItemConverter : null) ??
|| ((converter = (containerContract != null) ? containerContract.ItemConverter : null) != null) ((containerContract != null) ? containerContract.ItemConverter : null) ??
|| ((converter = valueContract.Converter) != null) valueContract.Converter ??
|| ((converter = Serializer.GetMatchingConverter(valueContract.UnderlyingType)) != null) Serializer.GetMatchingConverter(valueContract.UnderlyingType) ??
|| ((converter = valueContract.InternalConverter) != null)) valueContract.InternalConverter;
&& converter.CanWrite)
if (converter != null && converter.CanWrite)
{ {
SerializeConvertable(writer, converter, value, valueContract, containerContract, containerProperty); SerializeConvertable(writer, converter, value, valueContract, containerContract, containerProperty);
return; return;