Changeset 17088

Timestamp:

07/05/19 15:15:48 (5 years ago)

Author:

abeham

Message:

#2520: tested and simplified check

File:

• trunk/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs (modified) (2 diffs)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
-using Google.Protobuf;
 using HEAL.Attic;
 using HeuristicLab.Persistence.Default.Xml;
@@ -47 +45 @@
         return (T)ser.Deserialize(sjob);
       } catch (PersistenceException e) {
-        // Exceptions may arise because data in Hive was uploaded with former XML-based
-        // persistence or with Attic prior to 1.2.
         if (e.InnerException is InvalidDataException) {
-          // We assume the data was serialized with HEAL.Attic < 1.2 which did not use
-          // DeflateStream, but as of 1.2 uses DeflateStream by default
-          var compressedData = Compress(sjob);
-          try {
-            // retry with the job's data compressed
-            return (T)ser.Deserialize(compressedData);
-          } catch (PersistenceException e2) {
-            if (e2.InnerException is InvalidProtocolBufferException
-              || e2.InnerException is InvalidDataException) {
-              // retry deserialize original bytes with old persistence
-              return DeserializeWithXmlParser<T>(sjob);
-            } else throw;
-          }
-        }
-        if (e.InnerException is InvalidProtocolBufferException) {
           // 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 byte[] Compress(byte[] sjob) {
-      using (var memStream = new MemoryStream(sjob.Length)) {
-        using (var deflateStream = new DeflateStream(memStream, CompressionMode.Compress)) {
-          deflateStream.Write(sjob, 0, sjob.Length);
-        }
-        return memStream.ToArray();
       }
     }