From 09e16185eeb5a6573334e81bf66114a7f8565ac6 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 29 Oct 2015 15:14:40 +0000
Subject: [PATCH] Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)    115533 adavis:
 Merged 5.0.2-CLOUD (Cloud ) to 5.0.N (5.0.3)       115531 adavis: Merged
 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )          115517 abozianu:
 Merged DEV to 5.0.2-PLUS (5.0.2-PLUS)             115450 abozianu: MNT-15064
 : [Cloud Upgrade] Errors apear in alfresco.log after Stop & Start upgrade
 Alfresco Cloud 39.6.5 to 40 on DP

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../impl/AddUnmovableAspectToSitesPatch.java  | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AddUnmovableAspectToSitesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AddUnmovableAspectToSitesPatch.java
index bacfd620d6..44930de90e 100755
--- a/source/java/org/alfresco/repo/admin/patch/impl/AddUnmovableAspectToSitesPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/AddUnmovableAspectToSitesPatch.java
@@ -29,6 +29,8 @@ import org.alfresco.repo.admin.patch.AbstractPatch;
 import org.alfresco.repo.batch.BatchProcessWorkProvider;
 import org.alfresco.repo.batch.BatchProcessor;
 import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.site.SiteModel;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -106,6 +108,7 @@ public class AddUnmovableAspectToSitesPatch extends AbstractPatch
                 logger,
                 1000);
 
+        final String authenticatedUser = AuthenticationUtil.getFullyAuthenticatedUser();
         BatchProcessor.BatchProcessWorker<ChildAssociationRef> worker = new BatchProcessor.BatchProcessWorker<ChildAssociationRef>()
         {
             public void afterProcess() throws Throwable
@@ -121,17 +124,30 @@ public class AddUnmovableAspectToSitesPatch extends AbstractPatch
                 return entry.toString();
             }
 
-            public void process(ChildAssociationRef child) throws Throwable
+            public void process(final ChildAssociationRef child) throws Throwable
             {
-                try
+                /*
+                 * Fix for MNT-15064.
+                 * Run as authenticated user to make sure the nodes are searched in the correct space store.
+                 */
+                RunAsWork<Void> work = new RunAsWork<Void>()
                 {
-                    behaviourFilter.disableBehaviour(ContentModel.ASPECT_AUDITABLE);
-                    nodeService.addAspect(child.getChildRef(), ContentModel.ASPECT_UNMOVABLE, null);
-                }
-                finally
-                {
-                    behaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE);
-                }
+                    @Override
+                    public Void doWork() throws Exception
+                    {
+                        try
+                        {
+                            behaviourFilter.disableBehaviour(ContentModel.ASPECT_AUDITABLE);
+                            nodeService.addAspect(child.getChildRef(), ContentModel.ASPECT_UNMOVABLE, null);
+                        }
+                        finally
+                        {
+                            behaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE);
+                        }
+                        return null;
+                    }
+                };
+                AuthenticationUtil.runAs(work, authenticatedUser);
             }
         };