Changeset 15035 for branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Transformers/StorableClassTransformer.cs

Timestamp:

06/16/17 13:36:53 (7 years ago)

Author:

gkronber

Message:

#2520: made some changes related to renaming of storable members

File:

• branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Transformers/StorableClassTransformer.cs (modified) (4 diffs)

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Transformers/StorableClassTransformer.cs

@@ -94 +94 @@
       }
 
+      Dictionary<string, object> lastDict = new Dictionary<string, object>();
       foreach (var convMeth in conversionMethods) {
         if (StorableConversionAttribute.GetVersion(convMeth) != version)
           throw new PersistenceException(string.Format("No conversion method defined for type {0} version {1}", typeGuid, version));
-        dict = (Dictionary<string, object>)convMeth.Invoke(null, new object[] { dict });
+        lastDict = (Dictionary<string, object>)convMeth.Invoke(null, new object[] { dict });
+        foreach (var kvp in lastDict) {
+          dict[kvp.Key] = kvp.Value;
+        }
         version++;
       }
@@ -117 +121 @@
 
       // set all members as generated by conversion method chain
-      foreach (var kvp in dict.ToArray()) {
+      foreach (var kvp in dict) {
         var key = kvp.Key;
         var val = kvp.Value;
@@ -124 +128 @@
           var field = (FieldInfo)fieldInfo.MemberInfo;
           field.SetValue(obj, val);
-          dict.Remove(fieldInfo.Name);
+          lastDict.Remove(fieldInfo.Name); // only for consistency check
           continue;
         }
@@ -131 +135 @@
           var prop = (PropertyInfo)propInfo.MemberInfo;
           prop.SetValue(obj, val, null);
-          dict.Remove(propInfo.Name);
+          lastDict.Remove(propInfo.Name);    // only for consistency check
           continue;
         }
       }
 
-      if (dict.Any())
+      if (lastDict.Any())
         throw new PersistenceException(string.Format("Invalid conversion method. The following members are undefined in type {0} version {1}: {2}",
           typeGuid, typeInfo.StorableTypeAttribute.Version,
-          string.Join(", ", dict.Keys)));
+          string.Join(", ", lastDict.Keys)));
 
       var emptyArgs = new object[0];