diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java index 1a317e49bb..d48e4e2e25 100644 --- a/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java +++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java @@ -817,9 +817,14 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension refProperties = smartStore.getProperties(reference); + Serializable childName = refProperties.get(ContentModel.PROP_NAME); + QName childAssocQName = QName + .createQNameWithValidLocalName(VirtualContentModel.VIRTUAL_CONTENT_MODEL_1_0_URI, + childName.toString()); ChildAssociationRef assoc = new ChildAssociationRef(ContentModel.ASSOC_CONTAINS, parentNodeRef, - NodeArchiveService.QNAME_ARCHIVED_ITEM, + childAssocQName, referenceNodeRef, true, -1); diff --git a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java index 1a9950fd95..93b39265d9 100644 --- a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java +++ b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java @@ -1032,6 +1032,9 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe NodeRef parentRef = primaryParent.getParentRef(); assertEquals(virtualFolder1NodeRef, parentRef); + assertEquals(QName + .createQNameWithValidLocalName(VirtualContentModel.VIRTUAL_CONTENT_MODEL_1_0_URI, + "Node2"),primaryParent.getQName()); // check that the primary parent node of level 2 virtual folder is his // virtual folder parent