diff --git a/source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java b/source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java index 190d324306..2d0b0ccdfd 100644 --- a/source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java +++ b/source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java @@ -731,7 +731,7 @@ public class NodeArchiveServiceImpl implements NodeArchiveService private Pair getArchiveNodeRefAssocTypePair(final NodeRef archiveStoreRootNodeRef) { - String currentUser = getCurrentUser(); + final String currentUser = getCurrentUser(); if (archiveStoreRootNodeRef == null || !nodeService.exists(archiveStoreRootNodeRef)) { @@ -745,12 +745,19 @@ public class NodeArchiveServiceImpl implements NodeArchiveService } else { - List list = nodeService.getChildrenByName(archiveStoreRootNodeRef, - ContentModel.ASSOC_ARCHIVE_USER_LINK, - Collections.singletonList(currentUser)); + List list = AuthenticationUtil.runAs(new RunAsWork>() + { + @Override + public List 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(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 42f76ce532..85fa244a34 100644 --- a/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java +++ b/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java @@ -1022,7 +1022,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()); @@ -1035,6 +1038,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(),