#15 check if the object's property is not null

italopessoa · italopessoa · commit 90145ca4374c · 2018-03-28T22:34:57.000-03:00
diff --git a/src/Neo4j.Map.Extension/Map/NodeExtension.cs b/src/Neo4j.Map.Extension/Map/NodeExtension.cs
@@ -109,12 +109,13 @@ private static string MatchQuery<T>(T node) where T : Neo4jNode
                 foreach (PropertyInfo propInfo in node.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly))
                 {
                     Neo4jPropertyAttribute attr = propInfo.GetCustomAttribute<Neo4jPropertyAttribute>();
-                    if (attr != null)
+                    var value = propInfo.GetValue(node);
+                    if (attr != null && value != null)
                     {
                         if (propInfo.PropertyType.IsEnum)
-                            values.Add(attr.Name, TryGetEnumValueDescription(propInfo, propInfo.GetValue(node)));
+                            values.Add(attr.Name, TryGetEnumValueDescription(propInfo, value));
                         else
-                            values.Add(attr.Name, propInfo.GetValue(node));
+                            values.Add(attr.Name, value);
                     }
                 }
                 foreach (KeyValuePair<string, object> keyValue in values)

Original file line number	Diff line number	Diff line change
`@@ -109,12 +109,13 @@ private static string MatchQuery<T>(T node) where T : Neo4jNode`
`109`	`109`	`foreach (PropertyInfo propInfo in node.GetType().GetProperties(BindingFlags.Instance \| BindingFlags.Public \| BindingFlags.DeclaredOnly))`
`110`	`110`	`{`
`111`	`111`	`Neo4jPropertyAttribute attr = propInfo.GetCustomAttribute<Neo4jPropertyAttribute>();`
`112`		`- if (attr != null)`
	`112`	`+ var value = propInfo.GetValue(node);`
	`113`	`+ if (attr != null && value != null)`
`113`	`114`	`{`
`114`	`115`	`if (propInfo.PropertyType.IsEnum)`
`115`		`- values.Add(attr.Name, TryGetEnumValueDescription(propInfo, propInfo.GetValue(node)));`
	`116`	`+ values.Add(attr.Name, TryGetEnumValueDescription(propInfo, value));`
`116`	`117`	`else`
`117`		`- values.Add(attr.Name, propInfo.GetValue(node));`
	`118`	`+ values.Add(attr.Name, value);`
`118`	`119`	`}`
`119`	`120`	`}`
`120`	`121`	`foreach (KeyValuePair<string, object> keyValue in values)`