Changeset 1859 for trunk/sources/HeuristicLab.Persistence

Timestamp:

05/20/09 11:42:53 (16 years ago)

Author:

epitzer

Message:

Reuse serializer instances for different types and provide better error information. (#603)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.cs

@@ -68 +68 @@
 
     private Dictionary<Type, object> CreateSerializers(IEnumerable<TypeMapping> typeCache) {
+      Dictionary<Type, object> serializerInstances = new Dictionary<Type, object>();
       try {
         var map = new Dictionary<Type, object>();
@@ -74 +75 @@
           typeIds.Add(typeMapping.Id, type);
           Type serializerType = TypeLoader.Load(typeMapping.Serializer);
-          map.Add(type, Activator.CreateInstance(serializerType, true));
+          object serializer;
+          if (serializerInstances.ContainsKey(serializerType))
+            serializer = serializerInstances[serializerType];
+          else
+            serializer = Activator.CreateInstance(serializerType, true);
+          map.Add(type, serializer);
         }
         return map;
@@ -82 +88 @@
         throw new PersistenceException(
           "The serialization type cache could not be loaded.\r\n" +
-          "This usualy happens when you are missing an Assembly/Plugin.", e);
+          "This usualy happens when you are missing an Assembly or Plugin.", e);
       }
     }
@@ -113 +119 @@
     private void CompositeStartHandler(BeginToken token) {
       Type type = typeIds[(int)token.TypeId];
-      ICompositeSerializer compositeSerializer = null;
-      if (serializerMapping.ContainsKey(type))
-        compositeSerializer = serializerMapping[type] as ICompositeSerializer;
-      if (compositeSerializer == null)
-        throw new PersistenceException(String.Format(
-          "No suitable method for deserialization of type \"{0}\" found.",
-          type.VersionInvariantName()));
-      parentStack.Push(new Midwife(type, compositeSerializer, token.Id));
+      try {
+        parentStack.Push(new Midwife(type, (ICompositeSerializer)serializerMapping[type], token.Id));
+      } catch (Exception e) {
+        if (e is InvalidCastException || e is KeyNotFoundException) {
+          throw new PersistenceException(String.Format(
+            "Invalid composite serializer configuration for type \"{0}\".",
+            type.AssemblyQualifiedName), e);
+        } else {
+          throw new PersistenceException(String.Format(
+            "Unexpected exception while trying to compose object of type \"{0}\".",
+            type.AssemblyQualifiedName), e);
+        }
+      }
     }
 
@@ -134 +145 @@
     private void PrimitiveHandler(PrimitiveToken token) {
       Type type = typeIds[(int)token.TypeId];
-      object value = ((IPrimitiveSerializer)serializerMapping[type]).Parse(token.SerialData);
-      if (token.Id != null)
-        id2obj[(int)token.Id] = value;
-      SetValue(token.Name, value);
+      try {
+        object value = ((IPrimitiveSerializer)serializerMapping[type]).Parse(token.SerialData);
+        if (token.Id != null)
+          id2obj[(int)token.Id] = value;
+        SetValue(token.Name, value);
+      } catch (Exception e) {
+        if (e is InvalidCastException || e is KeyNotFoundException) {
+          throw new PersistenceException(String.Format(
+            "Invalid primitive serializer configuration for type \"{0}\".",
+            type.AssemblyQualifiedName), e);
+        } else {
+          throw new PersistenceException(String.Format(
+            "Unexpected exception while trying to parse object of type \"{0}\".",
+            type.AssemblyQualifiedName), e);
+        }
+      }
     }