From b6cc69db9b39c708fbcb22f1606c9d1373c09b69 Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Fri, 15 Apr 2016 12:15:32 +0000
Subject: [PATCH] Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)    125333 rneamtu:
 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)       125215 bhorje: ACE-5308 set valid
 parent association qname

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125440 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/virtual/bundle/VirtualNodeServiceExtension.java   | 7 ++++++-
 .../virtual/bundle/VirtualNodeServiceExtensionTest.java    | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

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<Node
                 }
 
                 NodeRef referenceNodeRef = reference.toNodeRef();
+                Map<QName, Serializable> 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