Changeset 1574 for trunk/sources

Timestamp:

04/16/09 17:14:17 (16 years ago)

Author:

epitzer

Message:

Fix problem with loading configuration. Properly initialize and register instance for empty types and make sure Formats have comparable hash codes. (#583)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Core

Files:

• DeSerializer.cs (modified) (2 diffs)
• FormatBase.cs (modified) (1 diff)

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

@@ -4 +4 @@
 using HeuristicLab.Persistence.Core.Tokens;
 
-namespace HeuristicLab.Persistence.Core {  
+namespace HeuristicLab.Persistence.Core {
 
-  public class Deserializer {    
+  public class Deserializer {
 
     class Midwife {
@@ -116 +116 @@
       Type type = typeIds[(int)token.TypeId];
       Midwife midwife = parentStack.Pop();
+      if (midwife.Obj == null)
+        CreateInstance(midwife);
       midwife.Populate();
       SetValue(token.Name, midwife.Obj);

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

@@ -20 +20 @@
     }
 
+    public override int GetHashCode() {
+      return Name.GetHashCode();
+    }
+
   }