Skip to content

Commit dfa9f6f

Browse files
authored
Fix naming v1 catalog page service api return all datum when pageSize is large. (#13218)
1 parent 551c203 commit dfa9f6f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Diff for: naming/src/main/java/com/alibaba/nacos/naming/core/CatalogServiceV2Impl.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,17 @@ private String getRegexString(String target) {
249249
}
250250

251251
private Collection<Service> doPage(Collection<Service> services, int pageNo, int pageSize) {
252-
if (services.size() < pageSize) {
252+
if (pageNo == 0 && services.size() < pageSize) {
253253
return services;
254254
}
255+
int start = pageNo * pageSize;
256+
if (start > services.size()) {
257+
return Collections.emptyList();
258+
}
255259
Collection<Service> result = new LinkedList<>();
256260
int i = 0;
257261
for (Service each : services) {
258-
if (i++ < pageNo * pageSize) {
262+
if (i++ < start) {
259263
continue;
260264
}
261265
result.add(each);

0 commit comments

Comments
 (0)