Changeset 17105 for stable/HeuristicLab.Clients.Hive

Timestamp:

07/08/19 00:23:12 (5 years ago)

Author:

mkommend

Message:

#2520: Merged 16584, 16585,16594,16595, 16625, 16658, 16659, 16672, 16707, 16729, 16792, 16796, 16797, 16799, 16819, 16906, 16907, 16908, 16933, 16945, 16992, 16994, 16995, 16996, 16997, 17014, 17015, 17017, 17020, 17021, 17022, 17023, 17024, 17029, 17086, 17087, 17088, 17089 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/packages.config (deleted)

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

@@ -107 +107 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
-    </Reference>
-    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
@@ -152 +143 @@
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Exceptions\AddTaskToHiveException.cs" />
@@ -272 +262 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -29 +29 @@
   [Plugin("HeuristicLab.Clients.Hive", "3.3.15.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Attic", "1.0")]
   [PluginDependency("HeuristicLab.Clients.Common", "3.3")]
   [PluginDependency("HeuristicLab.Clients.Access", "3.3")]  

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

@@ -44 +44 @@
       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 InvalidDataException) {
+          // We assume the data was not serialized with HEAL.Attic, but with the former
+          // XML-based persistence
+          return DeserializeWithXmlParser<T>(sjob);
+        } else throw;
+      }
+    }
+
+    private static T DeserializeWithXmlParser<T>(byte[] sjob) {
+      using (MemoryStream memStream = new MemoryStream(sjob)) {
+        return XmlParser.Deserialize<T>(memStream);
       }
     }