fix check when one is unlimited

JoaoJandre · JoaoJandre · commit d3d63e2eb0ef · 2023-07-14T09:16:19.000-03:00
diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -539,6 +539,10 @@ public long findCorrectResourceLimitForAccountAndDomain(Account account, Domain
         long maxSecondaryStorageForAccount = findCorrectResourceLimitForAccount(account, type);
         long maxSecondaryStorageForDomain = findCorrectResourceLimitForDomain(domain, type);
 
+        if (maxSecondaryStorageForDomain == Resource.RESOURCE_UNLIMITED || maxSecondaryStorageForAccount == Resource.RESOURCE_UNLIMITED) {
+            return Math.max(maxSecondaryStorageForDomain, maxSecondaryStorageForAccount);
+        }
+
         return Math.min(maxSecondaryStorageForDomain, maxSecondaryStorageForAccount);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -539,6 +539,10 @@ public long findCorrectResourceLimitForAccountAndDomain(Account account, Domain`
`539`	`539`	`long maxSecondaryStorageForAccount = findCorrectResourceLimitForAccount(account, type);`
`540`	`540`	`long maxSecondaryStorageForDomain = findCorrectResourceLimitForDomain(domain, type);`
`541`	`541`
	`542`	`+ if (maxSecondaryStorageForDomain == Resource.RESOURCE_UNLIMITED \|\| maxSecondaryStorageForAccount == Resource.RESOURCE_UNLIMITED) {`
	`543`	`+ return Math.max(maxSecondaryStorageForDomain, maxSecondaryStorageForAccount);`
	`544`	`+ }`
	`545`	`+`
`542`	`546`	`return Math.min(maxSecondaryStorageForDomain, maxSecondaryStorageForAccount);`
`543`	`547`	`}`
`544`	`548`