Changeset 14032 for trunk

Timestamp:

07/09/16 19:40:55 (8 years ago)

Author:

gkronber

Message:

#2626: reverted changes from r13998 and introduce a new attribute (ExcludeFromObjectGraphTraversalAttribute) which can be used to mark fields that should be excluded from object graph traversal

File:

• trunk/sources/HeuristicLab.Common/3.3/ObjectExtensions.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Common/3.3/ObjectExtensions.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Common {
+
+  [AttributeUsage(System.AttributeTargets.Field)]
+  // this attribute can be used to mark fields that should be excluded from object graph traversal
+  public class ExcludeFromObjectGraphTraversalAttribute : Attribute {
+  }
+
   public static class ObjectExtensions {
     public static IEnumerable<T> ToEnumerable<T>(this T obj) {
@@ -63 +69 @@
     ///   * System.Delegate
     ///   * System.Reflection.Pointer
-    ///   * System.RuntimeType
     ///   * Primitives (Boolean, Byte, SByte, Int16, UInt16, Int32, UInt32, Int64, UInt64, IntPtr, UIntPtr, Char, Double, Single)
     ///   * string, decimal, DateTime
@@ -80 +85 @@
              typeof(Pointer).IsAssignableFrom(type) ||
              type.Namespace == "System.Reflection.Emit" ||
-             type.Assembly.GetName().Name == "System.Runtime.Serialization" ||
-             typeof(TypeInfo).IsAssignableFrom(type) ||
              (type.HasElementType && ExcludeType(type.GetElementType()));
     }
@@ -117 +120 @@
       } else {
         if (!fieldInfos.ContainsKey(type))
-          fieldInfos[type] = type.GetAllFields().ToArray();
+          fieldInfos[type] = type.GetAllFields()
+            .Where(fi => !fi.GetCustomAttributes<ExcludeFromObjectGraphTraversalAttribute>().Any())
+            .ToArray();
         foreach (FieldInfo f in fieldInfos[type]) {
           if (excludeStaticMembers && f.IsStatic) continue;