You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/04/10 07:11:04 UTC
[cloudstack] branch 4.13 updated: server: Cannot list affinity group if there are hosts dedicated… (#4025)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.13 by this push:
new e0b67a4 server: Cannot list affinity group if there are hosts dedicated… (#4025)
e0b67a4 is described below
commit e0b67a4c68da3f4ed46ddcab9bae0fbaac5e3a67
Author: Wei Zhou <w....@global.leaseweb.com>
AuthorDate: Fri Apr 10 09:10:51 2020 +0200
server: Cannot list affinity group if there are hosts dedicated… (#4025)
---
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index d55aea4..fae7612 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -3626,7 +3626,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
affinityGroups.addAll(listDomainLevelAffinityGroups(scDomain, searchFilter, domainId));
}
- return new Pair<List<AffinityGroupJoinVO>, Integer>(affinityGroups, uniqueGroupsPair.second());
+ return new Pair<List<AffinityGroupJoinVO>, Integer>(affinityGroups, affinityGroups.size());
}