From 586763e113af146790ed550a6861250fe6a525b8 Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Wed, 29 Aug 2007 14:52:19 +0000
Subject: [PATCH] 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
---
 .../repo/config/xml/RepoXMLConfigService.java         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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