Changeset 2873 for trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.cs

Timestamp:

02/26/10 15:46:10 (14 years ago)

Author:

epitzer

Message:

Always instantiate parent before processing an inner composite. (#888)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.cs (modified) (2 diffs)

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

@@ -117 +117 @@
     }
 
+    private void InstantiateParent() {
+      if (parentStack.Count == 0)
+        return;
+      Midwife m = parentStack.Peek();
+      if (!m.MetaMode && m.Obj == null)
+        CreateInstance(m);
+    }
+
     private void CompositeStartHandler(BeginToken token) {
+      InstantiateParent();
       Type type = typeIds[(int)token.TypeId];
       try {
@@ -193 +202 @@
       } else {
         Midwife m = parentStack.Peek();
-        if (m.MetaMode == false && m.Obj == null)
+        if (m.MetaMode == false && m.Obj == null) {
           CreateInstance(m);
+        }
         m.AddValue(name, value);
       }