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 BRANCHES/DEV/V4.1-BUG-FIX to HEAD

Browse Source 
42431: Fix to initialisation code that can cause patches such as ActivitiesTemplatesUpdatePatch that access beans such as Repository before the spring bean init lifecycle has completed to fail.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2012-10-08 14:44:09 +00:00
parent adeb08d0c0
commit 4a6e3a5413
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/model/Repository.java
View File

@@ -76,9 +76,8 @@ public class Repository implements ApplicationContextAware, ApplicationListener,
// company home // company home
private StoreRef companyHomeStore; private StoreRef companyHomeStore;
private String companyHomePath; private String companyHomePath;
private Map<String, NodeRef> companyHomeRefs; final private Map<String, NodeRef> companyHomeRefs = new ConcurrentHashMap<String, NodeRef>();
final private Map<String, NodeRef> rootRefs = new ConcurrentHashMap<String, NodeRef>();
private Map<String, NodeRef> rootRefs;
/** /**
@@ -199,20 +198,9 @@ public class Repository implements ApplicationContextAware, ApplicationListener,
{ {
tenantAdminService.register(this); tenantAdminService.register(this);
if (companyHomeRefs == null)
{
companyHomeRefs = new ConcurrentHashMap<String, NodeRef>(4);
}
if (rootRefs == null)
{
rootRefs = new ConcurrentHashMap<String, NodeRef>(4);
}
getCompanyHome(); getCompanyHome();
} }
/** /**
* Gets the root home of the company home store * Gets the root home of the company home store
* *