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

Fix for WebClient config reload/reset - skip invalid config sources

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6868 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2007-09-27 09:47:28 +00:00
parent b4ec9a4992
commit 45ea44b784
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.transaction.UserTransaction; import javax.transaction.UserTransaction;
import org.alfresco.config.ConfigDeployment;
import org.alfresco.config.ConfigImpl; import org.alfresco.config.ConfigImpl;
import org.alfresco.config.ConfigSection; import org.alfresco.config.ConfigSection;
import org.alfresco.config.ConfigSource; import org.alfresco.config.ConfigSource;
@@ -138,9 +139,11 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
super(configSource); super(configSource);
} }
public void initConfig() public List<ConfigDeployment> initConfig()
{ {
// can be null e.g. initial login, after fresh bootstrap List<ConfigDeployment> configDeployments = null;
// can be null e.g. initial login, after fresh bootstrap
String currentUser = authenticationComponent.getCurrentUserName(); String currentUser = authenticationComponent.getCurrentUserName();
if (currentUser == null) if (currentUser == null)
{ {
@@ -154,7 +157,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
userTransaction.begin(); userTransaction.begin();
// parse config and initialise caches // parse config and initialise caches
super.initConfig(); configDeployments = super.initConfig();
userTransaction.commit(); userTransaction.commit();
@@ -172,6 +175,8 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
authenticationComponent.clearCurrentSecurityContext(); authenticationComponent.clearCurrentSecurityContext();
} }
} }
return configDeployments;
} }
public void destroy() public void destroy()