From fbf24eed693d810dfc06158a22976b7ebf45c1dc Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sat, 1 Nov 2014 14:37:54 +1300
Subject: [PATCH] -Refactor

---
 .../JsonSerializerInternalReader.cs           | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
index 058c0eb2..73fe9718 100644
--- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
+++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
@@ -207,21 +207,23 @@ namespace Newtonsoft.Json.Serialization
         {
             ValidationUtils.ArgumentNotNull(reader, "reader");
 
-            if (contract != null && contract.UnderlyingType == typeof(JRaw))
+            if (contract != null)
             {
-                return JRaw.Create(reader);
+                if (contract.UnderlyingType == typeof(JRaw))
+                    return JRaw.Create(reader);
+                if (reader.TokenType == JsonToken.Null
+                    && !(contract.UnderlyingType == typeof(JValue) || contract.UnderlyingType == typeof(JToken)))
+                    return null;
             }
-            else
-            {
-                JToken token;
-                using (JTokenWriter writer = new JTokenWriter())
-                {
-                    writer.WriteToken(reader);
-                    token = writer.Token;
-                }
 
-                return token;
+            JToken token;
+            using (JTokenWriter writer = new JTokenWriter())
+            {
+                writer.WriteToken(reader);
+                token = writer.Token;
             }
+
+            return token;
         }
 
         private JToken CreateJObject(JsonReader reader)
@@ -268,15 +270,7 @@ namespace Newtonsoft.Json.Serialization
         private object CreateValueInternal(JsonReader reader, Type objectType, JsonContract contract, JsonProperty member, JsonContainerContract containerContract, JsonProperty containerMember, object existingValue)
         {
             if (contract != null && contract.ContractType == JsonContractType.Linq)
-            {
-                JToken token = CreateJToken(reader, contract);
-
-                // test to make sure token is valid when null, e.g. can't set JValue.Null to JObject proeprty
-                if (token.Type == JTokenType.Null && !contract.UnderlyingType.IsAssignableFrom(typeof(JValue)))
-                    return null;
-
-                return token;
-            }
+                return CreateJToken(reader, contract);
 
             do
             {