From 2b37568a87a7be7421ed8f6d568699c307825a60 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 21 Dec 2011 15:13:10 -0800 Subject: [PATCH] bug 12001: fixed resource limit check for domain - treat -1 as unlimited status 12001: resolved fixed --- server/src/com/cloud/user/AccountManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 2d053d18676..1e45303e824 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -378,7 +378,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag Long domainId = account.getDomainId(); while (domainId != null) { ResourceLimitVO domainLimit = _resourceLimitDao.findByDomainIdAndType(domainId, type); - if (domainLimit != null) { + if (domainLimit != null && domainLimit.getMax().longValue() != -1) { long domainCount = _resourceCountDao.getDomainCount(domainId, type); if ((domainCount + numResources) > domainLimit.getMax().longValue()) { return true;