Changeset 14145 for stable

Timestamp:

07/21/16 09:53:55 (8 years ago)

Author:

gkronber

Message:

#2626: merged r13998, r14032 and r14144 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Common/3.3/ObjectExtensions.cs (modified) (2 diffs)

stable/HeuristicLab.Common/3.3/ObjectExtensions.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Common {
+
+  [AttributeUsage(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) {
@@ -113 +119 @@
         }
       } else {
-        if (!fieldInfos.ContainsKey(type))
-          fieldInfos[type] = type.GetAllFields().ToArray();
-        foreach (FieldInfo f in fieldInfos[type]) {
+        FieldInfo[] fieldInfo;
+        if (!fieldInfos.TryGetValue(type, out fieldInfo)) {
+          fieldInfo = type.GetAllFields()
+            .Where(fi => !Attribute.IsDefined(fi, typeof(ExcludeFromObjectGraphTraversalAttribute)))
+            .ToArray();
+          fieldInfos.Add(type, fieldInfo);
+        }
+        foreach (FieldInfo f in fieldInfo) {
           if (excludeStaticMembers && f.IsStatic) continue;
           object fieldValue;
           try {
             fieldValue = f.GetValue(obj);
-          }
-          catch (SecurityException) {
+          } catch (SecurityException) {
             continue;
           }