From d15dad68f3afa50408fb057b3a6a727f95981c09 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Fri, 14 Sep 2012 07:58:37 +0000 Subject: [PATCH] Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD: 41559: ALF-15569: User with '@' symbol in username cannot invite git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/tenant/MultiTenantBootstrap.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java b/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java index d9d50a19f4..2904c235e0 100644 --- a/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java +++ b/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2012 Alfresco Software Limited. * * This file is part of Alfresco * @@ -71,7 +71,7 @@ public class MultiTenantBootstrap extends AbstractLifecycleBean PropertyCheck.mandatory(this, "patchService", patchService); PropertyCheck.mandatory(this, "descriptorService", descriptorService); - if (tenantAdminService.isEnabled()) + if (tenantAdminService.getAllTenants().size() > 0) { // note: alf*attributes* tables do not exist from Alfresco 4.0.0 schema 5007 Descriptor desc = descriptorService.getInstalledRepositoryDescriptor();