Changeset 1625 for trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

Timestamp:

04/23/09 14:22:29 (15 years ago)

Author:

epitzer

Message:

Added PersistenceException used consistently for all error conditions in the persistence framework (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs (modified) (2 diffs)

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

@@ -42 +42 @@
           iterator = handlers[reader.Name].Invoke();
         } catch (KeyNotFoundException) {
-          throw new InvalidOperationException(String.Format(
-            "No handler for XML tag \"{0}\" installed",
+          throw new PersistenceException(String.Format(
+            "Invalid XML tag \"{0}\" in persistence file.",
             reader.Name));
         }
@@ -103 +103 @@
 
     public static List<TypeMapping> ParseTypeCache(TextReader reader) {
-      var typeCache = new List<TypeMapping>();
-      XmlReader xmlReader = XmlReader.Create(reader);
-      while (xmlReader.Read()) {
-        if (xmlReader.Name == XmlStringConstants.TYPE) {
-          typeCache.Add(new TypeMapping(
-            int.Parse(xmlReader.GetAttribute("id")),
-            xmlReader.GetAttribute("typeName"),
-            xmlReader.GetAttribute("serializer")));
+      try {
+        var typeCache = new List<TypeMapping>();
+        XmlReader xmlReader = XmlReader.Create(reader);
+        while (xmlReader.Read()) {
+          if (xmlReader.Name == XmlStringConstants.TYPE) {
+            typeCache.Add(new TypeMapping(
+              int.Parse(xmlReader.GetAttribute("id")),
+              xmlReader.GetAttribute("typeName"),
+              xmlReader.GetAttribute("serializer")));
+          }
         }
+        return typeCache;
+      } catch (PersistenceException e) {
+        throw;
+      } catch (Exception e) {
+        throw new PersistenceException("Unexpected exception during type cache parsing.", e);
       }
-      return typeCache;
     }
 
     public static object DeSerialize(string filename) {
-      ZipFile zipFile = new ZipFile(filename);
-      Deserializer deSerializer = new Deserializer(
-        ParseTypeCache(
-        new StreamReader(
-          zipFile.GetInputStream(zipFile.GetEntry("typecache.xml")))));
-      XmlParser parser = new XmlParser(
-        new StreamReader(zipFile.GetInputStream(zipFile.GetEntry("data.xml"))));
-      object result = deSerializer.Deserialize(parser);
-      zipFile.Close();
-      return result;
+      try {
+        ZipFile zipFile = new ZipFile(filename);
+        Deserializer deSerializer = new Deserializer(
+          ParseTypeCache(
+          new StreamReader(
+            zipFile.GetInputStream(zipFile.GetEntry("typecache.xml")))));
+        XmlParser parser = new XmlParser(
+          new StreamReader(zipFile.GetInputStream(zipFile.GetEntry("data.xml"))));
+        object result = deSerializer.Deserialize(parser);
+        zipFile.Close();
+        return result;
+      } catch (PersistenceException e) {
+        throw;
+      } catch (Exception e) {
+        throw new PersistenceException("Unexpected exception during deserialization", e);
+      }
     }
   }