Changeset 4175 for trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.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/Core/DeSerializer.cs (modified) (5 diffs)

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(