From d29a4e9646088619c0b540852589dba059804e89 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 28 Jul 2015 15:53:49 +0530 Subject: [PATCH] quota: only lock normal accounts Signed-off-by: Rohit Yadav --- .../src/org/apache/cloudstack/quota/job/QuotaManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/job/QuotaManagerImpl.java b/plugins/database/quota/src/org/apache/cloudstack/quota/job/QuotaManagerImpl.java index cdc08daee03..2c725d60a19 100644 --- a/plugins/database/quota/src/org/apache/cloudstack/quota/job/QuotaManagerImpl.java +++ b/plugins/database/quota/src/org/apache/cloudstack/quota/job/QuotaManagerImpl.java @@ -24,6 +24,7 @@ import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.usage.UsageVO; import com.cloud.usage.dao.UsageDao; +import com.cloud.user.Account; import com.cloud.user.AccountVO; import com.cloud.user.UserVO; import com.cloud.user.dao.AccountDao; @@ -278,7 +279,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager { if (accountBalanceVO != null && accountBalanceVO.getCreditBalance() != null) { BigDecimal accountBalance = accountBalanceVO.getCreditBalance(); if (accountBalance.compareTo(zeroBalance) <= 0) { - if (lockAccountEnforcement) { + if (lockAccountEnforcement && account.getType() == Account.ACCOUNT_TYPE_NORMAL) { try { _regionMgr.disableAccount(account.getAccountName(), account.getDomainId(), account.getId(), true); } catch (ResourceUnavailableException e) {