Changeset 13872 for branches

Timestamp:

06/03/16 15:10:08 (8 years ago)

Author:

jlodewyc

Message:

#2582 fix: compression error when loading jobs

Location:

branches/WebJobManager

Files:

• HeuristicLab.Clients.Hive.WebJobManager/Controllers/OkbManagementController.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs (modified) (1 diff)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/OkbManagementController.cs

@@ -4 +4 @@
 using HeuristicLab.Common;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.Xml;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -76 +77 @@
                         }
                     }
-                    var deser = PersistenceUtil.Deserialize<IOptimizer>(data);
+                    var deser = PersistenceUtil.Deserialize<IOptimizer>(data, CompressionType.Zip);
                     OKB.Administration.IOKBItem obj = null;
                     if (name == "Algorithms" && deser is IAlgorithm)

branches/WebJobManager/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs

@@ -54 +54 @@
             using (MemoryStream memStream = new MemoryStream(sjob))
             {
-                T job = XmlParser.Deserialize<T>(memStream, CompressionType.Zip);
+                T job = XmlParser.Deserialize<T>(memStream);
+                return job;
+            }
+        }
+        public static T Deserialize<T>(byte[] sjob, CompressionType typ)
+        {
+            using (MemoryStream memStream = new MemoryStream(sjob))
+            {
+                T job = XmlParser.Deserialize<T>(memStream, typ);
                 return job;
             }