MessageModelProvider review

Author: mgesing

src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs

@@ -1177,22 +1177,24 @@ private IEnumerable<TreeNode<ModelTreeMember>> BuildModelTreePartForClass(object
                 {
                     yield return new TreeNode<ModelTreeMember>(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Collection });
                 }
-                else
+                else if (pi.PropertyType.IsClass)
                 {
                     if (instanceLookup == null)
                     {
-                        instanceLookup = new HashSet<object>(ReferenceEqualityComparer.Default);
+                        instanceLookup = new HashSet<object>(ReferenceEqualityComparer.Default) { instance };
                     }
 
-                    var exists = !type.IsValueType && instanceLookup.Contains(instance);
-
-                    if (!exists)
+                    var childInstance = prop.GetValue(instance);
+                    if (childInstance != null)
                     {
-                        instanceLookup.Add(instance);
+                        if (!instanceLookup.Contains(childInstance))
+                        {
+                            instanceLookup.Add(childInstance);
 
-                        var node = new TreeNode<ModelTreeMember>(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Complex });
-                        node.AppendRange(BuildModelTreePartForClass(prop.GetValue(instance), instanceLookup));
-                        yield return node;
+                            var node = new TreeNode<ModelTreeMember>(new ModelTreeMember { Name = prop.Name, Kind = ModelTreeMemberKind.Complex });
+                            node.AppendRange(BuildModelTreePartForClass(childInstance, instanceLookup));
+                            yield return node;
+                        }
                     }
                 }
             }