From 01bc0b365157862fccb18eb3a37ea55e2624c2d8 Mon Sep 17 00:00:00 2001
From: Peter Hultqvist <phq@silentorbit.com>
Date: Thu, 19 Jun 2014 08:20:19 +0200
Subject: [PATCH] Extracting converter assignment

---
 .../JsonSerializerInternalWriter.cs             | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs
index 81f4aaa3..84c5358f 100644
--- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs
+++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs
@@ -141,14 +141,15 @@ namespace Newtonsoft.Json.Serialization
                 return;
             }
 
-            JsonConverter converter;
-            if ((((converter = (member != null) ? member.Converter : null) != null)
-                 || ((converter = (containerProperty != null) ? containerProperty.ItemConverter : null) != null)
-                 || ((converter = (containerContract != null) ? containerContract.ItemConverter : null) != null)
-                 || ((converter = valueContract.Converter) != null)
-                 || ((converter = Serializer.GetMatchingConverter(valueContract.UnderlyingType)) != null)
-                 || ((converter = valueContract.InternalConverter) != null))
-                && converter.CanWrite)
+            JsonConverter converter = 
+                ((member != null) ? member.Converter : null) ??
+                ((containerProperty != null) ? containerProperty.ItemConverter : null) ??
+                ((containerContract != null) ? containerContract.ItemConverter : null) ??
+                valueContract.Converter ??
+                Serializer.GetMatchingConverter(valueContract.UnderlyingType) ??
+                valueContract.InternalConverter;
+
+            if (converter != null && converter.CanWrite)
             {
                 SerializeConvertable(writer, converter, value, valueContract, containerContract, containerProperty);
                 return;