GH-2462 - Naive approach.

Author: meistermeier

src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jEntityConverter.java

@@ -353,7 +353,7 @@ private <ET> void populateProperties(MapAccessor queryResult, Neo4jPersistentEnt
 			// check intermediate types
 			NodeDescription<?> parentNodeDescription = concreteNodeDescription.getParentNodeDescription();
 			while (parentNodeDescription != null && parentNodeDescription != concreteNodeDescription) {
-				nodeDescription.doWithAssociations(
+				((Neo4jPersistentEntity<?>) parentNodeDescription).doWithAssociations(
 						populateFrom(queryResult, propertyAccessor, isConstructorParameter, objectAlreadyMapped, relationshipsFromResult, nodesFromResult));
 				parentNodeDescription = parentNodeDescription.getParentNodeDescription();
 			}

src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentEntity.java

@@ -512,11 +512,15 @@ public void addChildNodeDescription(NodeDescription<?> child) {
 	}
 
 	@Override
-	public Set<NodeDescription<?>> getChildNodeDescriptionsInHierarchy() {
-		Set<NodeDescription<?>> childNodes = new HashSet<>(childNodeDescriptions);
+	public List<NodeDescription<?>> getChildNodeDescriptionsInHierarchy() {
+		List<NodeDescription<?>> childNodes = new ArrayList<>(childNodeDescriptions);
 
 		for (NodeDescription<?> childNodeDescription : childNodeDescriptions) {
-			childNodes.addAll(childNodeDescription.getChildNodeDescriptionsInHierarchy());
+			for (NodeDescription<?> grantChildNodeDescription : childNodeDescription.getChildNodeDescriptionsInHierarchy()) {
+				if (!childNodes.contains(grantChildNodeDescription)) {
+					childNodes.add(grantChildNodeDescription);
+				}
+			}
 		}
 		return childNodes;
 	}