Changeset 17005 for branches/2994-AutoDiffForIntervals/HeuristicLab.Core/3.3

Timestamp:

06/11/19 20:59:44 (5 years ago)

Author:

gkronber

Message:

#2994: merged r16944:16997 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

@@ -25 +25 @@
 using HEAL.Attic;
 using System;
+using System.Diagnostics;
 
 namespace HeuristicLab.Core {
@@ -30 +31 @@
     public PersistenceContentManager() : base() { }
 
-    protected override IStorableContent LoadContent(string filename) {
-      // first try to load using the new persistence format
-      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);
-        }
+    protected override IStorableContent LoadContent(string filename, out Info info) {
+      bool useOldPersistence = XmlParser.CanOpen(filename);
+      IStorableContent content = null;
+      if (useOldPersistence) {
+        var sw = new Stopwatch();
+        sw.Start();
+        content = XmlParser.Deserialize<IStorableContent>(filename);
+        sw.Stop();
+        info = new Info(filename, sw.Elapsed);
+      } else {
+        var ser = new ProtoBufSerializer();
+        content = (IStorableContent)ser.Deserialize(filename, out SerializationInfo serInfo);
+        info = new Info(filename, serInfo);
       }
+      if (content == null) throw new PersistenceException($"Cannot deserialize root element of {filename}");
+      return content;
     }
+
 
     protected override void SaveContent(IStorableContent content, string filename, bool compressed, CancellationToken cancellationToken) {