Changeset 9869 for stable/HeuristicLab.Common/3.3/TypeExtensions.cs

Timestamp:

08/07/13 15:55:43 (11 years ago)

Author:

mkommend

Message:

#2095: Merged trunk changes for object graph traversal in the stable branch.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Common/3.3/TypeExtensions.cs (modified) (1 diff)

stable/HeuristicLab.Common/3.3/TypeExtensions.cs

@@ -49 +49 @@
 
     public static IEnumerable<FieldInfo> GetAllFields(this Type type) {
-      foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic))
-        yield return field;
-
-      foreach (var field in type.GetFields(BindingFlags.Static | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic))
-        yield return field;
-
-      if (type.BaseType != null) {
-        foreach (var field in type.BaseType.GetAllFields())
+      while (type != null) {
+        foreach (var field in type.GetFields(BindingFlags.Static | BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic))
           yield return field;
+        type = type.BaseType;
       }
     }