Changeset 1779 for trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.cs

Timestamp:

05/11/09 13:35:32 (15 years ago)

Author:

epitzer

Message:

Better type name parser. Replace reflection based type name generation, better exceptions during deserialization. (#613)

File:

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

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

@@ -74 +74 @@
           try {
             type = Type.GetType(typeMapping.TypeName, true);
-          } catch (Exception e) {
+          } catch (Exception) {
             Logger.Error(String.Format(
               "Cannot load type \"{0}\", falling back to loading with partial name", typeMapping.TypeName));
             string[] typeNameParts = typeMapping.TypeName.Split(new[] { ',' });
-            Assembly a = Assembly.LoadWithPartialName(typeNameParts[typeNameParts.Length - 1].Trim());
-            Array.Resize(ref typeNameParts, typeNameParts.Length - 1);
-            type = a.GetType(string.Join(",", typeNameParts), true);
+            try {
+              Assembly a = Assembly.LoadWithPartialName(typeNameParts[typeNameParts.Length - 1].Trim());
+              Array.Resize(ref typeNameParts, typeNameParts.Length - 1);
+              type = a.GetType(string.Join(",", typeNameParts), true);
+            } catch (Exception) {
+              throw new PersistenceException(String.Format(
+                "Could not load type \"{0}\"",
+                typeMapping.TypeName));
+            }
           }
           typeIds.Add(typeMapping.Id, type);
@@ -87 +93 @@
         }
         return map;
+      } catch (PersistenceException) {
+        throw;
       } catch (Exception e) {
         throw new PersistenceException(