Changeset 5714 for trunk/sources/HeuristicLab.Persistence/3.3/Default

Timestamp:

03/16/11 15:12:12 (14 years ago)

Author:

mkommend

Message:

#1442: Corrected bug in TupleSerializer.

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TupleSerializer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TupleSerializer.cs

@@ -63 +63 @@
     public IEnumerable<Tag> CreateMetaInfo(object obj) {
       Type t = obj.GetType();
-      for (int i = 1; i<=t.GetGenericArguments().Length; i++) {
+      for (int i = 1; i <= t.GetGenericArguments().Length; i++) {
         string name = string.Format("Item{0}", i);
         yield return new Tag(name, t.GetProperty(name).GetValue(obj, null));
@@ -79 +79 @@
     static TupleSerializer() {
       foreach (MethodInfo mi in typeof(Tuple).GetMethods(public_static).Where(mi => mi.Name == "Create")) {
-        CreateMethods[mi.GetGenericArguments().Length-1] = mi;
+        CreateMethods[mi.GetGenericArguments().Length - 1] = mi;
       }
     }
@@ -85 +85 @@
     public object CreateInstance(Type type, IEnumerable<Tag> metaInfo) {
       var values = metaInfo.Select(t => t.Value).ToArray();
-      MethodInfo createMethod = CreateMethods[values.Length-1].MakeGenericMethod(values.Select(v => v.GetType()).ToArray());
-      return createMethod.Invoke(null, values.ToArray());
+      MethodInfo createMethod = CreateMethods[values.Length - 1].MakeGenericMethod(type.GetGenericArguments());
+      return createMethod.Invoke(null, values);
     }