Changeset 16943 for branches/2994-AutoDiffForIntervals/HeuristicLab.Core/3.3/PersistenceContentManager.cs

Timestamp:

05/11/19 08:14:56 (5 years ago)

Author:

gkronber

Message:

#2994 merge r16933:16942 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

• . (modified) (1 prop)
• HeuristicLab.Core (modified) (1 prop)
• HeuristicLab.Core/3.3/PersistenceContentManager.cs (modified) (2 diffs)

branches/2994-AutoDiffForIntervals/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.Xml;
 using HEAL.Attic;
+using System;
 
 namespace HeuristicLab.Core {
@@ -32 +33 @@
       // first try to load using the new persistence format
       var ser = new ProtoBufSerializer();
-      var o = (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
-      if (info.SerializedTypes != null) {
-        return o;
+      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);
+        }
       }
-      // try old format if new format fails
-      return XmlParser.Deserialize<IStorableContent>(filename);
     }