Merged V3.0 to HEAD

12145: Merged V2.2 to V3.0 (AuthenticationUtil)
    12109: AuthenticationUtil and AuthenticationComponent refactor
  12152: Removed Lucene usage from lookup of 'sites' root folder
  12153: Fix InviteServiceTest by cleaning up leaking authentications
  12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java

@@ -1004,10 +1004,9 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo
                 throw new AlfrescoRuntimeException("Failed to get tenants", e);
             }
                            
-            String currentUser = AuthenticationUtil.getCurrentUserName();
-            
             try 
             {
+                AuthenticationUtil.pushAuthentication();
                 for (Tenant tenant : tenants)
                 { 
                     if (tenant.isEnabled()) 
@@ -1041,8 +1040,8 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo
                 }
             }
             finally
-            {    
-                if (currentUser != null) { AuthenticationUtil.setCurrentUser(currentUser); }
+            { 
+                AuthenticationUtil.popAuthentication();
             }
         }
     }