Changeset 16945 for trunk/HeuristicLab.Core/3.3

Timestamp:

05/11/19 14:38:47 (5 years ago)

Author:

jkarder

Message:

#2520: changed deserialization in PersistenceContentManager

• added method to check if old persistence can open a file
• used this method to determine which persistence to use

File:

• trunk/HeuristicLab.Core/3.3/PersistenceContentManager.cs (modified) (1 diff)

trunk/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -31 +31 @@
 
     protected override IStorableContent LoadContent(string filename) {
-      // first try to load using the new persistence format
+      bool useOldPersistence = XmlParser.CanOpen(filename);
+      if (useOldPersistence) return XmlParser.Deserialize<IStorableContent>(filename);
+
       var ser = new ProtoBufSerializer();
-      try {
-        return (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
-      } catch (Exception e) {
-        try {
-          // try old format if new format fails
-          return XmlParser.Deserialize<IStorableContent>(filename);
-        } catch (Exception e2) {
-          throw new AggregateException($"Cannot open file {filename}", e, e2);
-        }
-      }
+      return (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
     }