Merge pull request microsoft#90 from saikrishnav/stackoverflowfixport

StackOverflowFix Port: Merge pull request microsoft#89 from saikrishnav/stackoverflowfix
navin22 · Sep 27, 2016 · 4034866 · 4034866
2 parents cf65531 + b4bee6a
commit 4034866
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestObject.cs b/src/Microsoft.TestPlatform.ObjectModel/TestObject.cs
@@ -17,6 +17,15 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
     [DataContract]
     public abstract class TestObject
     {
+        static TestObject()
+        {
+            // Do TypeConverter registrations in static constructor only to avoid multiple registrations
+            // If we register too much, deserialization of large number of testobjects will cause StackOverflow exception
+            TypeDescriptor.AddAttributes(typeof(Guid), new TypeConverterAttribute(typeof(CustomGuidConverter)));
+            TypeDescriptor.AddAttributes(typeof(KeyValuePair<string, string>[]), new TypeConverterAttribute(typeof(CustomKeyValueConverter)));
+            TypeDescriptor.AddAttributes(typeof(string[]), new TypeConverterAttribute(typeof(CustomStringArrayConverter)));
+        }
+
         #region Fields
 
         /// <summary>
@@ -64,9 +73,6 @@ private List<KeyValuePair<TestProperty, object>> StoreKeyValuePairs
         protected TestObject()
         {
             this.store = new Dictionary<TestProperty, object>();            
-            TypeDescriptor.AddAttributes(typeof(Guid), new TypeConverterAttribute(typeof(CustomGuidConverter)));
-            TypeDescriptor.AddAttributes(typeof(KeyValuePair<string, string>[]), new TypeConverterAttribute(typeof(CustomKeyValueConverter)));
-            TypeDescriptor.AddAttributes(typeof(string[]), new TypeConverterAttribute(typeof(CustomStringArrayConverter)));
         }
 
         [OnSerializing]