From ce22405fd14f2bc5b15df236e53b14393dcae6fd Mon Sep 17 00:00:00 2001
From: Jamal Kaabi-Mofrad <Jamal.kaabimofrad@alfresco.com>
Date: Tue, 10 May 2016 11:38:09 +0000
Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)    124739
 gjames: ACE-5295: listArchivedNodes now works for non-admin users

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../node/archive/NodeArchiveServiceImpl.java    | 17 ++++++++++++-----
 .../node/archive/ArchiveAndRestoreTest.java     |  8 +++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java b/source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java
index ecb8c5e497..08aabb8d13 100644
--- a/source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java
@@ -724,7 +724,7 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
     
     private Pair<NodeRef, QName> getArchiveNodeRefAssocTypePair(final NodeRef archiveStoreRootNodeRef)
     {
-        String currentUser = getCurrentUser();
+        final String currentUser = getCurrentUser();
 
         if (archiveStoreRootNodeRef == null || !nodeService.exists(archiveStoreRootNodeRef))
         {
@@ -738,12 +738,19 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
         }
         else
         {
-            List<ChildAssociationRef> list = nodeService.getChildrenByName(archiveStoreRootNodeRef,
-                        ContentModel.ASSOC_ARCHIVE_USER_LINK,
-                        Collections.singletonList(currentUser));
+            List<ChildAssociationRef> list = AuthenticationUtil.runAs(new RunAsWork<List<ChildAssociationRef>>()
+            {
+                @Override
+                public List<ChildAssociationRef> doWork() throws Exception
+                {
+                    return nodeService.getChildrenByName(archiveStoreRootNodeRef,
+                            ContentModel.ASSOC_ARCHIVE_USER_LINK,
+                            Collections.singletonList(currentUser));
+                }
+            }, AuthenticationUtil.getAdminUserName());
 
             // Empty list means that the current user hasn't deleted anything yet.
-            if (list.isEmpty())
+            if (list == null || list.isEmpty())
             {
                 return new Pair<NodeRef, QName>(null, null);
             }
diff --git a/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java b/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
index df36e050a5..c9e661405a 100644
--- a/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
+++ b/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
@@ -1013,7 +1013,10 @@ public class ArchiveAndRestoreTest extends TestCase
 
         // USER_B deletes "bb"
         nodeService.deleteNode(bb);
-        
+
+        result = nodeArchiveService.listArchivedNodes(queryBuilder);
+        assertEquals("USER_B deleted 1 item and USER_B can see it.", 1, result.getPage().size());
+
         result = runListArchivedNodesAsAdmin(queryBuilder);
         assertEquals("USER_B deleted only 1 item.", 1, result.getPage().size());
 
@@ -1026,6 +1029,9 @@ public class ArchiveAndRestoreTest extends TestCase
                     this.archiveStoreRootNodeRef, paging)
                     .build();
 
+        result = nodeArchiveService.listArchivedNodes(queryBuilder);
+        assertEquals("USER_A deleted 1 item and USER_A can see it.", 1, result.getPage().size());
+
         result = runListArchivedNodesAsAdmin(queryBuilder);
         assertEquals("USER_A deleted only 1 item.", 1, result.getPage().size());
         assertEquals(QNAME_AA.getLocalName(),