diff --git a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java index b3827761b6..8cd7220ce0 100644 --- a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java +++ b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java @@ -846,11 +846,13 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent // Calculate name path Collection> namePaths = new ArrayList>(2); nodeMetaData.setNamePaths(namePaths); - for (Path path : directPaths) + for (Pair catPair : paths) { + Path path = catPair.getFirst(); + boolean added = false; List namePath = new ArrayList(path.size()); - for (Path.Element pathElement : path) + NEXT_ELEMENT: for (Path.Element pathElement : path) { if (!(pathElement instanceof ChildAssocElement)) { @@ -873,7 +875,7 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent // DH: There is no particular constraint here. This is just a decision made. namePath.clear(); // We have to continue down the path as there could be a name path lower down - continue; + continue NEXT_ELEMENT; } // We can finally add the name to the path namePath.add(childNodeName);