Make sure to call T's static constructor before using JsConfig<T>, since the static constructor may set OnDeserialized, etc.

Author: shift-evgeny

src/ServiceStack.Text/JsConfig.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using ServiceStack.Text.Common;
 using ServiceStack.Text.Json;
@@ -815,6 +816,12 @@ internal static void AddUniqueType(Type type)
 
     public class JsConfig<T>
     {
+        static JsConfig()
+        {
+            // Run the type's static constructor (which may set OnDeserialized, etc.) before we cache any information about it
+            RuntimeHelpers.RunClassConstructor(typeof(T).TypeHandle);
+        }
+
         /// <summary>
         /// Always emit type info for this type.  Takes precedence over ExcludeTypeInfo
         /// </summary>

tests/ServiceStack.Text.Tests/SerializationHookTests.cs

@@ -100,7 +100,20 @@ public void JsonSerializer_Deserialize_hooks_on_sub_class()
             Assert.That(deserialized.OnDeserializedTouched, Is.True);
         }
 
-        private void AddSerializeHooksForType<T>()
+        [Test]
+        public void JsonSerializer_Deserialize_hooks_set_in_cctor()
+        {
+            // Deserialize without serializing first, so we don't call the static constructor of HookTestCctor, which sets its own OnDeserialized callback.
+
+            //var original = new HookTestContainer { Child = new HookTestCctor() };
+            //var json = JsonSerializer.SerializeToString(original);
+            const string json = "{\"Child\":{\"OnDeserializingTouched\":false,\"OnDeserializedTouched\":false,\"OnSerializingTouched\":true,\"OnSerializedTouched\":false}}";
+
+            var deserialized = JsonSerializer.DeserializeFromString<HookTestContainer>(json);
+            Assert.That(deserialized.Child.OnDeserializedTouched, Is.True);
+        }
+
+        internal static void AddSerializeHooksForType<T>()
         {
             Type type = typeof(T);
             System.Reflection.MethodInfo[] typeMethods = type.GetMethods(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
@@ -192,5 +205,18 @@ protected void OnSerialized(StreamingContext ctx)
         public class HookTestSubClass : HookTestClass
         {
         }
+
+        public class HookTestCctor : HookTestClass
+        {
+            static HookTestCctor()
+            {
+                AddSerializeHooksForType<HookTestCctor>();
+            }
+        }
+
+        public class HookTestContainer
+        {
+            public HookTestCctor Child { get; set; }
+        }
     }
 }