Fix for AMP init/bootstrap issue found by RW - see also r6631.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2007-08-29 14:52:19 +00:00
parent 4c2aba1bd9
commit 586763e113

View File

@@ -138,7 +138,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
super(configSource); super(configSource);
} }
public void init() public void initConfig()
{ {
// can be null e.g. initial login, after fresh bootstrap // can be null e.g. initial login, after fresh bootstrap
String currentUser = authenticationComponent.getCurrentUserName(); String currentUser = authenticationComponent.getCurrentUserName();
@@ -153,8 +153,9 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
{ {
userTransaction.begin(); userTransaction.begin();
super.init(); // parse config and initialise caches // parse config and initialise caches
super.initConfig();
userTransaction.commit(); userTransaction.commit();
logger.info("Config initialised"); logger.info("Config initialised");
@@ -189,7 +190,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
{ {
public Object doWork() public Object doWork()
{ {
init(); initConfig();
return null; return null;
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getSystemUserName());
@@ -223,7 +224,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
public void onEnableTenant() public void onEnableTenant()
{ {
init(); // will be called in context of tenant initConfig(); // will be called in context of tenant
} }
public void onDisableTenant() public void onDisableTenant()