Changeset 1795 for trunk/sources/HeuristicLab.Persistence/3.3/Core

Timestamp:

05/14/09 13:00:36 (15 years ago)

Author:

epitzer

Message:

Also make sure major and minor version match (not only newer) + better tests. (#613)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Core

Files:

• DeSerializer.cs (modified) (2 diffs)
• Serializer.cs (modified) (1 diff)

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

@@ -17 +17 @@
       } catch (Exception) {
         Logger.Warn(String.Format(
-          "Cannot load type \"{0}\", falling back to loading with partial name", typeNameString));
+          "Cannot load type \"{0}\", falling back to partial name", typeNameString));
         try {
           TypeName typeName = TypeNameParser.Parse(typeNameString);
@@ -28 +28 @@
         }
         try {
-          if (
-            TypeNameParser.Parse(type.AssemblyQualifiedName).IsOlderThan(
-            TypeNameParser.Parse(typeNameString)))
+          TypeName requestedTypeName = TypeNameParser.Parse(typeNameString);
+          TypeName loadedTypeName = TypeNameParser.Parse(type.AssemblyQualifiedName);
+          if (!requestedTypeName.IsCompatible(loadedTypeName))
+            throw new PersistenceException(String.Format(
+              "Serialized type is incompatible with available type: serialized: {0}, loaded: {1}",
+              typeNameString,
+              type.AssemblyQualifiedName));
+          if (requestedTypeName.IsNewerThan(loadedTypeName))
             throw new PersistenceException(String.Format(
               "Serialized type is newer than available type: serialized: {0}, loaded: {1}",

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

@@ -45 +45 @@
             serializer = d.GetType().AssemblyQualifiedName;
           }
-          //result.Add(new TypeMapping(pair.Value, pair.Key.AssemblyQualifiedName, serializer));
-          result.Add(new TypeMapping(pair.Value, pair.Key.VersionInvariantName(), serializer));
+          result.Add(new TypeMapping(pair.Value, pair.Key.AssemblyQualifiedName, serializer));
         }
         return result;