Changeset 14594 for branches/PersistenceOverhaul/HeuristicLab.Core/3.3/PersistenceContentManager.cs

Timestamp:

01/20/17 11:16:42 (8 years ago)

Author:

jkarder

Message:

#2520: worked on persistence

File:

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

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.IO.Compression;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence;
 using HeuristicLab.Persistence.Default.Xml;
 
@@ -29 +31 @@
 
     protected override IStorableContent LoadContent(string filename) {
-      return XmlParser.Deserialize<IStorableContent>(filename);
+      try {
+        return XmlParser.Deserialize<IStorableContent>(filename);
+      } catch (Exception) {
+        var serializer = new ProtoBufSerializer();
+        return (IStorableContent)serializer.Deserialize(filename);
+      }
     }
 
     protected override void SaveContent(IStorableContent content, string filename, bool compressed) {
-      XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression);
+      //XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression);
+      new ProtoBufSerializer().Serialize(content, filename);
     }
   }