-Fixed elusive Intellitrace runtime destabilization error

2012-01-10 05:19:43 +00:00
parent 90297804e1
commit b00ff2d37b
1 changed files with 9 additions and 2 deletions
@@ -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>