Changeset 1704

Timestamp:

04/29/09 15:31:06 (16 years ago)

Author:

epitzer

Message:

Properly close file during serialization even if an exception occurs. (#606)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs (modified) (1 diff)

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

@@ -164 +164 @@
         Serializer serializer = new Serializer(obj, config);
         XmlGenerator generator = new XmlGenerator();
-        ZipOutputStream zipStream = new ZipOutputStream(File.Create(filename));
-        zipStream.SetLevel(9);
-        zipStream.PutNextEntry(new ZipEntry("data.xml"));
-        StreamWriter writer = new StreamWriter(zipStream);
         ILog logger = Logger.GetDefaultLogger();
-        foreach (ISerializationToken token in serializer) {
-          string line = generator.Format(token);
-          writer.Write(line);
-          logger.Debug(line.TrimEnd());
+        using (ZipOutputStream zipStream = new ZipOutputStream(File.Create(filename))) {
+          zipStream.SetLevel(9);
+          zipStream.PutNextEntry(new ZipEntry("data.xml"));
+          StreamWriter writer = new StreamWriter(zipStream);
+          foreach (ISerializationToken token in serializer) {
+            string line = generator.Format(token);
+            writer.Write(line);
+            logger.Debug(line.TrimEnd());
+          }
+          writer.Flush();
+          zipStream.PutNextEntry(new ZipEntry("typecache.xml"));
+          foreach (string line in generator.Format(serializer.TypeCache)) {
+            writer.Write(line);
+            logger.Debug(line.TrimEnd());
+          }
+          writer.Flush();
         }
-        writer.Flush();
-        zipStream.PutNextEntry(new ZipEntry("typecache.xml"));
-        writer = new StreamWriter(zipStream);
-        foreach (string line in generator.Format(serializer.TypeCache)) {
-          writer.Write(line);
-          logger.Debug(line.TrimEnd());
-        }
-        writer.Flush();
-        zipStream.Close();
       } catch (PersistenceException e) {
         throw;