Changeset 1682

Timestamp:

04/28/09 12:40:29 (16 years ago)

Author:

epitzer

Message:

If type loading with partial name fails, explicitly load assembly with partial name (obsolete interface) to obtain newest assembly from assembly cache. (#604)

File:

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

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

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Tracing;
+using System.Reflection;
 
 namespace HeuristicLab.Persistence.Core {
@@ -68 +70 @@
         var map = new Dictionary<Type, object>();
         foreach (var typeMapping in typeCache) {
-          Type type = Type.GetType(typeMapping.TypeName, true);
+          Type type;
+          try {
+            type = Type.GetType(typeMapping.TypeName, true);
+          } catch (Exception e) {
+            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);
+          }
           typeIds.Add(typeMapping.Id, type);
           Type serializerType = Type.GetType(typeMapping.Serializer, true);