Ticket #2520: persistenceutil_attic12.patch

HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

@@ -106 +106 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\Google.Protobuf.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />

HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame

@@ -40 +40 @@
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Protobuf", "3.6.1")]
   public class HeuristicLabClientsHivePlugin : PluginBase {
   }
 }

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Google.Protobuf;
 using HEAL.Attic;
 using HeuristicLab.Persistence.Default.Xml;
 
@@ -43 +44 @@
       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);
-        }
+      } catch (PersistenceException e) {
+        if (e.InnerException is InvalidProtocolBufferException
+          || e.InnerException is InvalidDataException) {
+          // retry with old persistence
+          using (MemoryStream memStream = new MemoryStream(sjob)) {
+            return XmlParser.Deserialize<T>(memStream);
+          }
+        } else throw;
       }
     }
   }