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 
69948: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69866: Merged V4.2.2 to V4.2-BUG-FIX (V4.2.3)
         69863: Fix edge-case read-only server browsing of sites that require the tagscope aspect (MNT-11310)
         69864 (RECORD-ONLY): Removed deep svn:mergeinfo
         69865 (RECORD-ONLY): Undo r69863 (MNT-11310) as incorrect branch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-05-16 20:08:47 +00:00
parent 9898a4c200
commit 81d2356496
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -2860,26 +2860,31 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
final NodeRef container = containerTmp; final NodeRef container = containerTmp;
// Ensure the calendar container has the tag scope aspect applied to it // Ensure the calendar container has the tag scope aspect applied to it
if(! taggingService.isTagScope(container)) if (!taggingService.isTagScope(container))
{ {
if(logger.isDebugEnabled()) if(logger.isDebugEnabled())
{ {
logger.debug("Attaching tag scope to " + componentName + " " + container.toString() + " for " + siteShortName); logger.debug("Attaching tag scope to " + componentName + " " + container.toString() + " for " + siteShortName);
} }
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>() { AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>()
public Void doWork() throws Exception {
{ public Void doWork() throws Exception
transactionService.getRetryingTransactionHelper().doInTransaction( {
new RetryingTransactionCallback<Void>() { RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
public Void execute() throws Throwable { txnHelper.setForceWritable(true);
// Add the tag scope aspect txnHelper.doInTransaction(
taggingService.addTagScope(container); new RetryingTransactionCallback<Void>()
return null; {
} public Void execute() throws Throwable
}, false, true {
// Add the tag scope aspect
taggingService.addTagScope(container);
return null;
}
}, false, true
); );
return null; return null;
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getSystemUserName());
} }