Skip to content

Commit 826e479

Browse files
authored
api: Fix pagination for list PublicIPAddresses (#5231)
* api: Fix pagination for list PublicIPAddresses * refactor based on comment
1 parent a436869 commit 826e479

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

server/src/main/java/com/cloud/server/ManagementServerImpl.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,7 +2111,7 @@ public Pair<List<? extends IpAddress>, Integer> searchForIPAddresses(final ListP
21112111
}
21122112
}
21132113

2114-
final Filter searchFilter = new Filter(IPAddressVO.class, "address", false, cmd.getStartIndex(), cmd.getPageSizeVal());
2114+
final Filter searchFilter = new Filter(IPAddressVO.class, "address", false, null, null);
21152115
final SearchBuilder<IPAddressVO> sb = _publicIpAddressDao.createSearchBuilder();
21162116
Long domainId = null;
21172117
Boolean isRecursive = null;
@@ -2197,7 +2197,10 @@ public Pair<List<? extends IpAddress>, Integer> searchForIPAddresses(final ListP
21972197
sc2.setParameters("ids", freeAddrIds.toArray());
21982198
addrs.addAll(_publicIpAddressDao.search(sc2, searchFilter)); // Allocated + Free
21992199
}
2200-
2200+
List<? extends IpAddress> wPagination = com.cloud.utils.StringUtils.applyPagination(addrs, cmd.getStartIndex(), cmd.getPageSizeVal());
2201+
if (wPagination != null) {
2202+
return new Pair<List<? extends IpAddress>, Integer>(wPagination, addrs.size());
2203+
}
22012204
return new Pair<>(addrs, addrs.size());
22022205
}
22032206

0 commit comments

Comments
 (0)