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

ETHREEOH-1548 - remove tenant domain threadlocal

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka 2009-03-20 10:10:01 +00:00
parent 0eb0ed1646
commit 7a010a2836
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,6 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
private SimpleCache<String, ConfigData> configDataCache; private SimpleCache<String, ConfigData> configDataCache;
// used to reset the cache // used to reset the cache
private ThreadLocal<String> tenantDomainThreadLocal = new ThreadLocal<String>();
private ThreadLocal<ConfigData> configDataThreadLocal = new ThreadLocal<ConfigData>(); private ThreadLocal<ConfigData> configDataThreadLocal = new ThreadLocal<ConfigData>();
public void setTransactionService(TransactionService transactionService) public void setTransactionService(TransactionService transactionService)
@ -195,8 +194,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
ConfigData configData = getConfigDataLocal(tenantDomain); ConfigData configData = getConfigDataLocal(tenantDomain);
if (configData == null) if (configData == null)
{ {
configData = new ConfigData(); configData = new ConfigData(tenantDomain);
this.tenantDomainThreadLocal.set(tenantDomain);
this.configDataThreadLocal.set(configData); this.configDataThreadLocal.set(configData);
} }
@ -320,7 +318,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
ConfigData configData = this.configDataThreadLocal.get(); ConfigData configData = this.configDataThreadLocal.get();
// check to see if domain switched (eg. during login) // check to see if domain switched (eg. during login)
if ((configData != null) && (tenantDomain.equals(tenantDomainThreadLocal.get()))) if ((configData != null) && (tenantDomain.equals(configData.getTenantDomain())))
{ {
return configData; // return threadlocal, if set return configData; // return threadlocal, if set
} }
@ -451,6 +449,18 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
private List<ConfigDeployment> configDeployments; private List<ConfigDeployment> configDeployments;
private String tenantDomain;
public ConfigData(String tenantDomain)
{
this.tenantDomain = tenantDomain;
}
public String getTenantDomain()
{
return tenantDomain;
}
public ConfigImpl getGlobalConfig() public ConfigImpl getGlobalConfig()
{ {
return globalConfig; return globalConfig;