Add some locks around static dictionaries.

It's possible this introduced some multithreading issues.

Resolves #113.

Author: jacobdufault

Assets/FullSerializer/Source/Reflection/fsMetaType.cs

@@ -15,8 +15,10 @@ public class fsMetaType {
 
         public static fsMetaType Get(fsConfig config, Type type) {
             Dictionary<Type, fsMetaType> metaTypes;
-            if (_configMetaTypes.TryGetValue(config, out metaTypes) == false)
-                metaTypes = _configMetaTypes[config] = new Dictionary<Type, fsMetaType>();
+            lock (typeof(fsMetaType)) {
+                if (_configMetaTypes.TryGetValue(config, out metaTypes) == false)
+                    metaTypes = _configMetaTypes[config] = new Dictionary<Type, fsMetaType>();
+            }
 
             fsMetaType metaType;
             if (metaTypes.TryGetValue(type, out metaType) == false) {
@@ -32,7 +34,9 @@ public static fsMetaType Get(fsConfig config, Type type) {
         /// serialization mode.
         /// </summary>
         public static void ClearCache() {
-            _configMetaTypes = new Dictionary<fsConfig, Dictionary<Type, fsMetaType>>();
+            lock (typeof(fsMetaType)) {
+                _configMetaTypes = new Dictionary<fsConfig, Dictionary<Type, fsMetaType>>();
+            }
         }
 
         private fsMetaType(fsConfig config, Type reflectedType) {

Assets/FullSerializer/Source/Reflection/fsTypeCache.cs

@@ -24,34 +24,37 @@ public static class fsTypeCache {
         private static List<Assembly> _assembliesByIndex;
 
         static fsTypeCache() {
-            // Setup assembly references so searching and the like resolves correctly.
-            _assembliesByName = new Dictionary<string, Assembly>();
-            _assembliesByIndex = new List<Assembly>();
+            lock (typeof(fsTypeCache)) {
+                // Setup assembly references so searching and the like resolves correctly.
+                _assembliesByName = new Dictionary<string, Assembly>();
+                _assembliesByIndex = new List<Assembly>();
 
 #if (!UNITY_EDITOR && UNITY_METRO && !ENABLE_IL2CPP) // no AppDomain on WinRT
-            var assembly = typeof(object).GetTypeInfo().Assembly;
-            _assembliesByName[assembly.FullName] = assembly;
-            _assembliesByIndex.Add(assembly);
-#else
-            foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) {
+                var assembly = typeof(object).GetTypeInfo().Assembly;
                 _assembliesByName[assembly.FullName] = assembly;
                 _assembliesByIndex.Add(assembly);
-            }
+#else
+                foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) {
+                    _assembliesByName[assembly.FullName] = assembly;
+                    _assembliesByIndex.Add(assembly);
+                }
 #endif
-
-            _cachedTypes = new Dictionary<string, Type>();
+                _cachedTypes = new Dictionary<string, Type>();
 
 #if !(UNITY_WP8  || UNITY_METRO) // AssemblyLoad events are not supported on these platforms
-            AppDomain.CurrentDomain.AssemblyLoad += OnAssemblyLoaded;
+                AppDomain.CurrentDomain.AssemblyLoad += OnAssemblyLoaded;
 #endif
+            }
         }
 
 #if !(UNITY_WP8 || UNITY_METRO) // AssemblyLoad events are not supported on these platforms
         private static void OnAssemblyLoaded(object sender, AssemblyLoadEventArgs args) {
-            _assembliesByName[args.LoadedAssembly.FullName] = args.LoadedAssembly;
-            _assembliesByIndex.Add(args.LoadedAssembly);
+            lock (typeof(fsTypeCache)) {
+                _assembliesByName[args.LoadedAssembly.FullName] = args.LoadedAssembly;
+                _assembliesByIndex.Add(args.LoadedAssembly);
 
-            _cachedTypes = new Dictionary<string, Type>();
+                _cachedTypes = new Dictionary<string, Type>();
+            }
         }
 #endif
 
@@ -150,17 +153,19 @@ public static Type GetType(string name, string assemblyHint) {
                 return null;
             }
 
-            Type type;
-            if (_cachedTypes.TryGetValue(name, out type) == false) {
-                // if both the direct and indirect type lookups fail, then throw an exception
-                if (TryDirectTypeLookup(assemblyHint, name, out type) == false &&
-                    TryIndirectTypeLookup(name, out type) == false) {
+            lock (typeof(fsTypeCache)) {
+                Type type;
+                if (_cachedTypes.TryGetValue(name, out type) == false) {
+                    // if both the direct and indirect type lookups fail, then throw an exception
+                    if (TryDirectTypeLookup(assemblyHint, name, out type) == false &&
+                        TryIndirectTypeLookup(name, out type) == false) {
+                    }
+
+                    _cachedTypes[name] = type;
                 }
 
-                _cachedTypes[name] = type;
+                return type;
             }
-
-            return type;
         }
     }
 }