Changeset 16907 for trunk/HeuristicLab.Core/3.3

Timestamp:

05/07/19 14:48:48 (5 years ago)

Author:

gkronber

Message:

#2520 Show more info in the exception dialog when persistence fails

File:

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

trunk/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.Xml;
 using HEAL.Attic;
-using System;
 
 namespace HeuristicLab.Core {
@@ -32 +31 @@
     protected override IStorableContent LoadContent(string filename) {
       // first try to load using the new persistence format
-      try {
-        var ser = new ProtoBufSerializer();
-        return (IStorableContent)ser.Deserialize(filename);
-      } catch (Exception) {
-        // try old format if new format fails
-        return XmlParser.Deserialize<IStorableContent>(filename);
+      var ser = new ProtoBufSerializer();
+      var o = (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
+      if (info.SerializedTypes != null) {
+        return o;
       }
+      // try old format if new format fails
+      return XmlParser.Deserialize<IStorableContent>(filename);
     }
 
     protected override void SaveContent(IStorableContent content, string filename, bool compressed, CancellationToken cancellationToken) {
       var ser = new ProtoBufSerializer();
-      ser.Serialize(content, filename, cancellationToken); 
+      ser.Serialize(content, filename, cancellationToken);
     }
   }