Changeset 14144

Timestamp:

07/21/16 07:17:25 (8 years ago)

Author:

abeham

Message:

#2626: some minor changes and speed improvements

File:

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

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

@@ -31 +31 @@
 namespace HeuristicLab.Common {
 
-  [AttributeUsage(System.AttributeTargets.Field)]
+  [AttributeUsage(AttributeTargets.Field)]
   // this attribute can be used to mark fields that should be excluded from object graph traversal
   public class ExcludeFromObjectGraphTraversalAttribute : Attribute {
@@ -119 +119 @@
         }
       } else {
-        if (!fieldInfos.ContainsKey(type))
-          fieldInfos[type] = type.GetAllFields()
-            .Where(fi => !fi.GetCustomAttributes<ExcludeFromObjectGraphTraversalAttribute>().Any())
+        FieldInfo[] fieldInfo;
+        if (!fieldInfos.TryGetValue(type, out fieldInfo)) {
+          fieldInfo = type.GetAllFields()
+            .Where(fi => !Attribute.IsDefined(fi, typeof(ExcludeFromObjectGraphTraversalAttribute)))
             .ToArray();
-        foreach (FieldInfo f in fieldInfos[type]) {
+          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;
           }