Changeset 16565 for trunk/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs

Timestamp:

01/28/19 13:41:42 (5 years ago)

Author:

gkronber

Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs (modified) (3 diffs)

trunk/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 using System.Collections.Generic;
 using System.IO;
-using HeuristicLab.Persistence.Core;
+using HEAL.Attic;
 using HeuristicLab.Persistence.Default.Xml;
 
@@ -29 +29 @@
   public static class PersistenceUtil {
     public static byte[] Serialize(object obj, out IEnumerable<Type> types) {
-      using (MemoryStream memStream = new MemoryStream()) {
-        XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
-        byte[] jobByteArray = memStream.ToArray();
-        return jobByteArray;
-      }
+      var ser = new ProtoBufSerializer();
+      var bytes = ser.Serialize(obj, out SerializationInfo info);
+      types = info.SerializedTypes;
+      return bytes;
     }
 
     public static byte[] Serialize(object obj) {
-      using (MemoryStream memStream = new MemoryStream()) {
-        XmlGenerator.Serialize(obj, memStream);
-        byte[] jobByteArray = memStream.ToArray();
-        return jobByteArray;
-      }
+      var ser = new ProtoBufSerializer();
+      return ser.Serialize(obj);
     }
 
     public static T Deserialize<T>(byte[] sjob) {
-      using (MemoryStream memStream = new MemoryStream(sjob)) {
-        T job = XmlParser.Deserialize<T>(memStream);
-        return job;
+      var ser = new ProtoBufSerializer();
+      try {
+        return (T)ser.Deserialize(sjob);
+      } catch (Exception) {
+        // retry with old persistence
+        using (MemoryStream memStream = new MemoryStream(sjob)) {
+          return XmlParser.Deserialize<T>(memStream);
+        }
       }
     }