Changeset 3205 for trunk/sources/HeuristicLab.Persistence/3.3/Default

Timestamp:

03/23/10 14:13:58 (15 years ago)

Author:

epitzer

Message:

correctly allow interleaving of storable and empty classes (#548)

File:

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

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

@@ -42 +42 @@
     }
 
-    public static bool IsEmptyOrStorableType(Type type, bool recusrive) {
-      if (IsEmptyType(type, recusrive)) return true;
-      if (!HasStorableClassAttribute(type)) return false;
-      return !recusrive || type.BaseType == null || IsEmptyOrStorableType(type.BaseType, true);
+    public static bool IsEmptyOrStorableType(Type type, bool recursive) {      
+      if (!HasStorableClassAttribute(type) && !IsEmptyType(type, false)) return false;
+      return !recursive || type.BaseType == null || IsEmptyOrStorableType(type.BaseType, true);
     }
 
@@ -77 +76 @@
       foreach (MemberInfo memberInfo in type.GetMembers(DECLARED_INSTANCE_MEMBERS)) {
         if ((memberInfo.MemberType & memberTypes) == memberInfo.MemberType &&
-            !memberInfo.Name.StartsWith("<") && 
+            !memberInfo.Name.StartsWith("<") &&
             !memberInfo.Name.EndsWith("k__BackingField"))
           storableMembers.Add(new StorableMemberInfo(memberInfo));
@@ -133 +132 @@
         .GetCustomAttributes(typeof(StorableClassAttribute), false)
         .SingleOrDefault();
-    }    
+    }
 
     private static bool HasStorableClassAttribute(Type type) {
@@ -152 +151 @@
     private static bool IsModifiableMember(MemberInfo memberInfo) {
       return memberInfo.MemberType == MemberTypes.Field && IsModifiableField((FieldInfo)memberInfo) ||
-                memberInfo.MemberType == MemberTypes.Property && IsModifiableProperty((PropertyInfo)memberInfo);
+             memberInfo.MemberType == MemberTypes.Property && IsModifiableProperty((PropertyInfo)memberInfo);
     }