From b17d1afcb29d7640bfdf1c4c83ed13fe9f9329bf Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 21 Oct 2009 06:37:10 +0000 Subject: [PATCH] Fixed cache usage pattern for webScriptsRegistryCache - Code was assuming that an entry put into the cache would be present later on - A full, null or rapidly-expiring cache would cause stack overflow git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/web/scripts/RepositoryContainer.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java b/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java index 4443831220..3ba1a2de7e 100644 --- a/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java +++ b/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java @@ -462,8 +462,9 @@ public class RepositoryContainer extends AbstractRuntimeContainer implements Ten Registry registry = webScriptsRegistryCache.get(tenantDomain); if (registry == null) { - init(); - registry = webScriptsRegistryCache.get(tenantDomain); + registry = (Registry)registryFactory.getObject(); + registry.reset(); + webScriptsRegistryCache.put(tenantDomain, registry); } return registry; } @@ -556,9 +557,6 @@ public class RepositoryContainer extends AbstractRuntimeContainer implements Ten { tenantAdminService.register(this); - Registry registry = (Registry)registryFactory.getObject(); - webScriptsRegistryCache.put(tenantAdminService.getCurrentUserDomain(), registry); - super.reset(); }