Changeset 1733

Timestamp:

05/04/09 16:43:46 (16 years ago)

Author:

epitzer

Message:

Added Serialization to stream. Do not overwrite file if serialization fails. (#603)

Location:

trunk/sources/HeuristicLab.Persistence

Files:

• 3.3/Default/Xml/XmlGenerator.cs (modified) (1 diff)
• UnitTests/UseCases.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

@@ -161 +161 @@
 
     public static void Serialize(object obj, string filename, Configuration config) {
+      string tempfile = Path.GetTempFileName();
+      try {
+        Serialize(obj, File.Create(tempfile), config);
+        File.Copy(tempfile, filename, true);
+        File.Delete(tempfile);
+      } catch (Exception x) {
+        Logger.Warn("Exception caught, no data has been written.");
+        throw;
+      }
+    }
+
+    public static void Serialize(object obj, Stream stream, Configuration config) {
       try {
         Serializer serializer = new Serializer(obj, config);
         XmlGenerator generator = new XmlGenerator();
         ILog logger = Logger.GetDefaultLogger();
-        using (ZipOutputStream zipStream = new ZipOutputStream(File.Create(filename))) {
+        using (ZipOutputStream zipStream = new ZipOutputStream(stream)) {
           zipStream.SetLevel(9);
           zipStream.PutNextEntry(new ZipEntry("data.xml"));

trunk/sources/HeuristicLab.Persistence/UnitTests/UseCases.cs

@@ -172 +172 @@
     [Storable]
     public KeyValuePair<List<C>, C> kvpList;
+  }
+
+  public class NonSerializable {
+    int x;
   }
 
@@ -504 +508 @@
     }
 
+    [TestMethod]
+    public void TestSavingException() {      
+      List<int> list = new List<int> { 1, 2, 3 };
+      XmlGenerator.Serialize(list, tempFile);
+      NonSerializable s = new NonSerializable();
+      try {
+        XmlGenerator.Serialize(s, tempFile);
+        Assert.Fail("Exception expected");
+      } catch (PersistenceException) { }
+      List<int> newList = (List<int>)XmlParser.DeSerialize(tempFile);
+      Assert.AreEqual(list[0], newList[0]);
+      Assert.AreEqual(list[1], newList[1]);
+    }
+
     [ClassInitialize]
     public static void Initialize(TestContext testContext) {