Changeset 6181

Timestamp:

05/11/11 13:44:50 (14 years ago)

Author:

mkommend

Message:

#1522: Reorganized type checks and added a clause to exclude primitive arrays from being enumerated.

File:

• trunk/sources/HeuristicLab.Common/3.3/ObjectExtensions.cs (modified) (1 diff)

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

@@ -34 +34 @@
 
     private static void CollectObjectGraphObjects(this object obj, HashSet<object> objects) {
-      if (obj == null || obj is Delegate || obj is EventHandler || obj.GetType().IsSubclassOfRawGeneric(typeof(EventHandler<>)) || objects.Contains(obj)) return;
+      if (obj == null || objects.Contains(obj)) return;
+      if (obj is ValueType || obj is string) return;
+      if (obj is Delegate || obj is EventHandler) return;
+      if (obj.GetType().IsSubclassOfRawGeneric(typeof(EventHandler<>))) return;
+      if (obj.GetType().GetElementType() != null) {
+        Type elementType = obj.GetType().GetElementType();
+        if (elementType.IsPrimitive || elementType == typeof(string) || elementType == typeof(decimal)) return;
+      }
+
       objects.Add(obj);
-
-      if (obj is ValueType || obj is string) return;
 
       IEnumerable enumerable = obj as IEnumerable;