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

Timestamp:

03/10/10 15:27:10 (14 years ago)

Author:

epitzer

Message:

add caches for hooks (#900)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (2 diffs)

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

@@ -19 +19 @@
       if (!ReflectionTools.HasDefaultConstructor(type))
         return false;
-      while (type != null) {        
+      while (type != null) {
         if (StorableAttribute.GetStorableMembers(type, false).Count() == 0 &&
             !EmptyStorableClassAttribute.IsEmptyStorable(type))
@@ -39 +39 @@
     }
 
+    private static readonly object[] defaultArgs = new object[] { true };
+
     public object CreateInstance(Type type, IEnumerable<Tag> metaInfo) {
       try {
-        object instance = StorableConstructorAttribute.CallStorableConstructor(type);
-        if (instance == null)
-          instance = Activator.CreateInstance(type, true);
-        return instance;
+        ConstructorInfo constructor = StorableConstructorAttribute.GetStorableConstructor(type);
+        return constructor != null ? constructor.Invoke(defaultArgs) :  Activator.CreateInstance(type, true);        
       } catch (TargetInvocationException x) {
         throw new PersistenceException(