Changeset 16553 for branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Util

Timestamp:

01/24/19 19:22:44 (6 years ago)

Author:

gkronber

Message:

#2520 for Hive serialization: added collection of serialized types and fall-back to old persistence format on deserialization. ITask must be a StorableType

File:

• branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs

@@ -24 +24 @@
 using System.IO;
 using HEAL.Fossil;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Clients.Hive {
   public static class PersistenceUtil {
     public static byte[] Serialize(object obj, out IEnumerable<Type> types) {
-      using (MemoryStream memStream = new MemoryStream()) {
-        throw new NotImplementedException("Not supported by HEAL.Fossil yet."); // TODO
-        // XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
-        // byte[] jobByteArray = memStream.ToArray();
-        // return jobByteArray;
-      }
+      var ser = new ProtoBufSerializer();
+      return ser.Serialize(obj, out types);
     }
 
@@ -43 +40 @@
     public static T Deserialize<T>(byte[] sjob) {
       var ser = new ProtoBufSerializer();
-      return (T)ser.Deserialize(sjob);
+      try {
+        return (T)ser.Deserialize(sjob);
+      } catch (Exception) {
+        // retry with old persistence
+        using (MemoryStream memStream = new MemoryStream(sjob)) {
+          return XmlParser.Deserialize<T>(memStream);
+        }
+      }
     }
   }