From 3d1d97523e0c26e4f5e1801160743742b4014e57 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Mon, 18 Feb 2008 16:06:37 +0000 Subject: [PATCH] MT - fix NPE (check tenant exists) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8311 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/tenant/MultiTAdminServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java index c2da58c963..5004b23f21 100755 --- a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java +++ b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java @@ -457,6 +457,11 @@ public class MultiTAdminServiceImpl extends AbstractLifecycleBean implements Ten public void enableTenant(String tenantDomain) { + if (! existsTenant(tenantDomain)) + { + throw new RuntimeException("Tenant does not exist: " + tenantDomain); + } + if (isEnabledTenant(tenantDomain)) { logger.warn("Tenant already enabled: " + tenantDomain); @@ -495,6 +500,11 @@ public class MultiTAdminServiceImpl extends AbstractLifecycleBean implements Ten public void disableTenant(String tenantDomain) { + if (! existsTenant(tenantDomain)) + { + throw new RuntimeException("Tenant does not exist: " + tenantDomain); + } + if (! isEnabledTenant(tenantDomain)) { logger.warn("Tenant already disabled: " + tenantDomain); @@ -566,6 +576,11 @@ public class MultiTAdminServiceImpl extends AbstractLifecycleBean implements Ten public Tenant getTenant(String tenantDomain) { + if (! existsTenant(tenantDomain)) + { + throw new RuntimeException("Tenant does not exist: " + tenantDomain); + } + return new Tenant(tenantDomain, isEnabledTenant(tenantDomain), getRootContentStoreDir(tenantDomain)); }