Skip to content

Commit c4ece0b

Browse files
committed
fix check when one is unlimited
1 parent 2d99568 commit c4ece0b

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,10 @@ public long findCorrectResourceLimitForAccountAndDomain(Account account, Domain
539539
long maxSecondaryStorageForAccount = findCorrectResourceLimitForAccount(account, type);
540540
long maxSecondaryStorageForDomain = findCorrectResourceLimitForDomain(domain, type);
541541

542+
if (maxSecondaryStorageForDomain == Resource.RESOURCE_UNLIMITED || maxSecondaryStorageForAccount == Resource.RESOURCE_UNLIMITED) {
543+
return Math.max(maxSecondaryStorageForDomain, maxSecondaryStorageForAccount);
544+
}
545+
542546
return Math.min(maxSecondaryStorageForDomain, maxSecondaryStorageForAccount);
543547
}
544548

0 commit comments

Comments
 (0)