From b00ff2d37b2d6f5e1c12a0fd61e6290ea4f7b3e2 Mon Sep 17 00:00:00 2001
From: JamesNK <james@newtonking.com>
Date: Tue, 10 Jan 2012 05:19:43 +0000
Subject: [PATCH] -Fixed elusive Intellitrace runtime destabilization error

---
 .../Serialization/DefaultContractResolver.cs          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs b/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs
index 97150f57..75050339 100644
--- a/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs
+++ b/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs
@@ -783,12 +783,19 @@ namespace Newtonsoft.Json.Serialization
     /// <returns>The <see cref="IValueProvider"/> used by the serializer to get and set values from a member.</returns>
     protected virtual IValueProvider CreateMemberValueProvider(MemberInfo member)
     {
+      // warning - this method use to cause errors with Intellitrace. Retest in VS Ultimate after changes
+      IValueProvider valueProvider;
+
 #if !PocketPC && !SILVERLIGHT
       if (DynamicCodeGeneration)
-        return new DynamicValueProvider(member);
+        valueProvider = new DynamicValueProvider(member);
+      else
+        valueProvider = new ReflectionValueProvider(member);
+#else
+      valueProvider = new ReflectionValueProvider(member);
 #endif
 
-      return new ReflectionValueProvider(member);
+      return valueProvider;
     }
 
     /// <summary>