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

Timestamp:

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

Author:

epitzer

Message:

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

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (4 diffs)

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