Changeset 4175

Timestamp:

08/06/10 16:59:13 (14 years ago)

Author:

epitzer

Message:

Properly copy serializers when initializing global configuration. (#1136)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Core/ConfigurationService.cs (modified) (5 diffs)
• Core/DeSerializer.cs (modified) (5 diffs)
• Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs

@@ -94 +94 @@
       try {
         TryLoadSettings();
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         if (throwOnError) {
           throw new PersistenceException("Could not load persistence settings.", e);
@@ -162 +161 @@
           if (a != defaultAssembly)
             DiscoverFrom(a);
-      }
-      catch (AppDomainUnloadedException x) {
+      } catch (AppDomainUnloadedException x) {
         Logger.Warn("could not get list of assemblies, AppDomain has already been unloaded", x);
       }
@@ -207 +205 @@
           }
         }
-      }
-      catch (ReflectionTypeLoadException e) {
+      } catch (ReflectionTypeLoadException e) {
         Logger.Warn("could not analyse assembly: " + a.FullName, e);
       }
@@ -223 +220 @@
         foreach (IPrimitiveSerializer f in PrimitiveSerializers[format.SerialDataType]) {
           if (!primitiveConfig.ContainsKey(f.SourceType))
-            primitiveConfig.Add(f.SourceType, f);
+            primitiveConfig.Add(f.SourceType, (IPrimitiveSerializer)Activator.CreateInstance(f.GetType()));
         }
       } else {
@@ -234 +231 @@
         format,
         primitiveConfig.Values,
-        CompositeSerializers.Where((d) => d.Priority > 0));
+        CompositeSerializers.Where((d) => d.Priority > 0).Select(d => (ICompositeSerializer)Activator.CreateInstance(d.GetType())));
     }
 

trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.cs

@@ -85 +85 @@
     private readonly Stack<Midwife> parentStack;
     private readonly Dictionary<int, Type> typeIds;
+    private Dictionary<Type, object> serializerInstances;
 
     /// <summary>
@@ -98 +99 @@
       typeIds = new Dictionary<int, Type>();
       serializerMapping = new Dictionary<Type, object>();
+      serializerInstances = new Dictionary<Type, object>();
       foreach (var typeMapping in typeCache) {
         AddTypeInfo(typeMapping);
       }
     }
-
-    private Dictionary<Type, object> serializerInstances = new Dictionary<Type, object>();
 
     /// <summary>
@@ -117 +117 @@
         Type serializerType = TypeLoader.Load(typeMapping.Serializer);
         object serializer;
-        if (serializerInstances.ContainsKey(serializerType))
+        if (serializerInstances.ContainsKey(serializerType)) {
           serializer = serializerInstances[serializerType];
-        else
+        } else {
           serializer = Activator.CreateInstance(serializerType, true);
+          serializerInstances.Add(serializerType, serializer);
+        }
         serializerMapping.Add(type, serializer);
-      }
-      catch (PersistenceException) {
+      } catch (PersistenceException) {
         throw;
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         throw new PersistenceException(string.Format(
           "Could not add type info for {0} ({1})",
@@ -181 +181 @@
       try {
         parentStack.Push(new Midwife(type, (ICompositeSerializer)serializerMapping[type], token.Id));
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         if (e is InvalidCastException || e is KeyNotFoundException) {
           throw new PersistenceException(String.Format(
@@ -211 +210 @@
           id2obj[(int)token.Id] = value;
         SetValue(token.Name, value);
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         if (e is InvalidCastException || e is KeyNotFoundException) {
           throw new PersistenceException(String.Format(

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -40 +40 @@
   [StorableClass]
   public sealed class StorableSerializer : ICompositeSerializer {
+
+    public StorableSerializer() {
+      accessorListCache = new AccessorListCache();
+      accessorCache = new AccessorCache();
+      constructorCache = new Dictionary<Type, Constructor>();
+      hookCache = new Dictionary<HookDesignator, List<StorableReflection.Hook>>();
+    }
 
     #region ICompositeSerializer implementation
@@ -122 +129 @@
       try {
         return GetConstructor(type)();
-      }
-      catch (TargetInvocationException x) {
+      } catch (TargetInvocationException x) {
         throw new PersistenceException(
           "Could not instantiate storable object: Encountered exception during constructor call",
@@ -174 +180 @@
     private sealed class AccessorListCache : Dictionary<Type, IEnumerable<DataMemberAccessor>> { }
     private sealed class AccessorCache : Dictionary<MemberInfo, DataMemberAccessor> { }
+    private delegate object Constructor();
 
     #endregion
@@ -179 +186 @@
     #region caches
 
-    private AccessorListCache accessorListCache = new AccessorListCache();
-    private AccessorCache accessorCache = new AccessorCache();
-
-    private delegate object Constructor();
-
-    private Dictionary<Type, Constructor> constructorCache =
-      new Dictionary<Type, Constructor>();
-
-    private Dictionary<HookDesignator, List<StorableReflection.Hook>> hookCache =
-      new Dictionary<HookDesignator, List<StorableReflection.Hook>>();
+    private AccessorListCache accessorListCache;
+    private AccessorCache accessorCache;
+    private Dictionary<Type, Constructor> constructorCache;
+    private Dictionary<HookDesignator, List<StorableReflection.Hook>> hookCache;
 
     #endregion