Changeset 2873 for trunk/sources

Timestamp:

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

Author:

epitzer

Message:

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

Location:

trunk/sources/HeuristicLab.Persistence

Files:

• 3.3/Core/DeSerializer.cs (modified) (2 diffs)
• UnitTests/UseCases.cs (modified) (1 diff)

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);
       }

trunk/sources/HeuristicLab.Persistence/UnitTests/UseCases.cs

@@ -581 +581 @@
     }
 
+    class Child {
+      [Storable]
+      public GrandParent grandParent;
+    }
+
+    class Parent {
+      [Storable]
+      public Child child;
+    }
+
+    class GrandParent {
+      [Storable]
+      public Parent parent;
+    }
+
+    [TestMethod]
+    public void InstantiateParentChainReference() {
+      GrandParent gp = new GrandParent();
+      gp.parent = new Parent();
+      gp.parent.child = new Child();
+      gp.parent.child.grandParent = gp;
+      Assert.AreSame(gp, gp.parent.child.grandParent);
+      XmlGenerator.Serialize(gp, tempFile);
+      GrandParent newGp = (GrandParent)XmlParser.Deserialize(tempFile);
+      Assert.AreSame(newGp, newGp.parent.child.grandParent);
+    }
+
     [ClassInitialize]
     public static void Initialize(TestContext testContext) {