inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
69951: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69870: MNT-11310 : Applying patch 'patch.siteLoadPatch.swsdp': Error message when applying patch in read-only mode
        - Using global instance of retryingTransactionHelper at patch transaction and using correct runAs user 
        - correct restoring of fullyAuthenticatedUser
      Note that this fix requires the changes to the RetryingTransactionHelper that precede it


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-05-16 20:11:48 +00:00
parent 85c8583145
commit a2d120e503
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/admin/patch/AbstractPatch.java
View File

@@ -450,7 +450,7 @@ public abstract class AbstractPatch implements Patch, ApplicationEventPublisher
if (requiresTransaction()) if (requiresTransaction())
{ {
// execute in a transaction // execute in a transaction
String temp = transactionService.getRetryingTransactionHelper().doInTransaction(patchWork, false, true); String temp = this.transactionHelper.doInTransaction(patchWork, false, true);
sb.append(temp); sb.append(temp);
} }
else else

2
source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
View File

@@ -257,7 +257,7 @@ public class SiteLoadPatch extends AbstractPatch
); );
// At this point we can go back to being the system // At this point we can go back to being the system
AuthenticationUtil.setRunAsUser(AuthenticationUtil.getSystemUserName()); AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
// Setup the Importer Bootstrap Beans // Setup the Importer Bootstrap Beans
for(ImporterBootstrap bootstrap : new ImporterBootstrap[] { spacesBootstrap, usersBootstrap }) for(ImporterBootstrap bootstrap : new ImporterBootstrap[] { spacesBootstrap, usersBootstrap })