From 45ea44b78421fd3f7fb21b392a43b35acebfba4f Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Thu, 27 Sep 2007 09:47:28 +0000 Subject: [PATCH] Fix for WebClient config reload/reset - skip invalid config sources git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6868 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/config/xml/RepoXMLConfigService.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java b/source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java index a06aeb747c..223001952c 100644 --- a/source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java +++ b/source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java @@ -32,6 +32,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.transaction.UserTransaction; +import org.alfresco.config.ConfigDeployment; import org.alfresco.config.ConfigImpl; import org.alfresco.config.ConfigSection; import org.alfresco.config.ConfigSource; @@ -138,9 +139,11 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl super(configSource); } - public void initConfig() + public List initConfig() { - // can be null e.g. initial login, after fresh bootstrap + List configDeployments = null; + + // can be null e.g. initial login, after fresh bootstrap String currentUser = authenticationComponent.getCurrentUserName(); if (currentUser == null) { @@ -154,7 +157,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl userTransaction.begin(); // parse config and initialise caches - super.initConfig(); + configDeployments = super.initConfig(); userTransaction.commit(); @@ -172,6 +175,8 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl authenticationComponent.clearCurrentSecurityContext(); } } + + return configDeployments; } public void destroy()