Changeset 1434 for branches/New Persistence Exploration/Persistence/Persistence/Default/Decomposers/StorableDecomposer.cs

Timestamp:

03/26/09 17:56:55 (15 years ago)

Author:

epitzer

Message:

Almost complete solution for correctly handling parent references. (#506)

File:

• branches/New Persistence Exploration/Persistence/Persistence/Default/Decomposers/StorableDecomposer.cs (modified) (1 diff)

branches/New Persistence Exploration/Persistence/Persistence/Default/Decomposers/StorableDecomposer.cs

@@ -28 +28 @@
 
     public object Populate(object instance, IEnumerable<Tag> objects, Type type) {           
-      var memberDict = new Dictionary<string, object>();      
+      var memberDict = new Dictionary<string, Tag>();      
       IEnumerator<Tag> iter = objects.GetEnumerator();      
       while (iter.MoveNext()) {
-        memberDict.Add((string)iter.Current.Name, iter.Current.Value);
+        memberDict.Add((string)iter.Current.Name, iter.Current);
       }      
       foreach (var mapping in StorableAttribute.GetAutostorableAccessors(instance)) {
-        if ( memberDict.ContainsKey(mapping.Key) )
-          mapping.Value.Set(memberDict[mapping.Key]);
-        else if ( mapping.Value.DefaultValue != null )
+        if (memberDict.ContainsKey(mapping.Key)) {
+          memberDict[mapping.Key].SafeSet(mapping.Value.Set);
+        } else if (mapping.Value.DefaultValue != null) {
           mapping.Value.Set(mapping.Value.DefaultValue);
+        }
       }
       return instance;