Changeset 2990

Timestamp:

03/10/10 13:39:32 (14 years ago)

Author:

epitzer

Message:

unwrap exceptions during constructor call when deserializing storable objects (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (1 diff)
• Tests/UseCases.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -40 +40 @@
 
     public object CreateInstance(Type type, IEnumerable<Tag> metaInfo) {
-      object instance = StorableConstructorAttribute.CallStorableConstructor(type);
-      if (instance == null)
-        instance = Activator.CreateInstance(type, true);
-      return instance;
+      try {
+        object instance = StorableConstructorAttribute.CallStorableConstructor(type);
+        if (instance == null)
+          instance = Activator.CreateInstance(type, true);
+        return instance;
+      } catch (TargetInvocationException x) {
+        throw new PersistenceException(
+          "Could not instantiate storable object: Encountered exception during constructor call",
+          x.InnerException);
+      }
     }
 

trunk/sources/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -715 +715 @@
     }
 
+    [EmptyStorableClass]
+    public class ExplodingDefaultConstructor {
+      public ExplodingDefaultConstructor() {
+        throw new Exception("this constructor will always fail");
+      }
+      public ExplodingDefaultConstructor(string password) {
+      }
+    }
+
+    [TestMethod]
+    public void TestConstructorExceptionUnwrapping() {
+      ExplodingDefaultConstructor x = new ExplodingDefaultConstructor("password");
+      XmlGenerator.Serialize(x, tempFile);
+      try {
+        ExplodingDefaultConstructor newX = (ExplodingDefaultConstructor)XmlParser.Deserialize(tempFile);
+        Assert.Fail("Exception expected");
+      } catch (PersistenceException pe) {
+        Assert.AreEqual(pe.InnerException.Message, "this constructor will always fail");
+      }
+    }
+
     [ClassInitialize]
     public static void Initialize(TestContext testContext) {