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

MERGE DEV TO HEAD

Browse Source 
55401 - ALF-19922 MT: Custom model (exampleModel.xml) is not applied for tenant

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2013-09-18 12:23:58 +00:00
parent 70cdf799a8
commit 3a4ece465a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java
View File

@@ -117,7 +117,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
return null;
}
};
RunAsWork<Void> getConfigRunAs = new RunAsWork<Void>()
TenantUtil.TenantRunAsWork<Void> getConfigRunAs = new TenantUtil.TenantRunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
@@ -138,8 +138,8 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
// Put some mutable config onto the current thread and have the superclasses mess with that.
ConfigData configData = new ConfigData();
configUnderConstruction.set(configData);
// Do the work
AuthenticationUtil.runAsSystem(getConfigRunAs);
// Do the work as system tenant, see ALF-19922
TenantUtil.runAsSystemTenant(getConfigRunAs, tenantDomain);
// Now wrap the config so that it cannot be changed
configData = new ImmutableConfigData(configData);
// Done
@@ -326,6 +326,6 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
@Override
protected void removeElementReaders()
{
throw new UnsupportedOperationException("'destroy' method must destroy all config. Piecemeal destruction is not supported.");
throw new UnsupportedOperationException("'destroy' method must destroy all config. Piecemeal destruction is not supported.");
}
}