Update ServiceController.java (#3176)

adjust order for start and end ，avoid end value is negative number
alibaba · Jun 28, 2020 · 41525b0 · 41525b0
1 parent 49c163b
commit 41525b0
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
@@ -247,12 +247,11 @@ public ObjectNode list(HttpServletRequest request) throws Exception {
         }
 
         int start = (pageNo - 1) * pageSize;
-        int end = start + pageSize;
-
         if (start < 0) {
             start = 0;
         }
 
+        int end = start + pageSize;
         if (end > serviceNameList.size()) {
             end = serviceNameList.size();
         }
@@ -456,14 +455,12 @@ public ObjectNode subscribers(HttpServletRequest request) {
             List<Subscriber> subscribers = subscribeManager.getSubscribers(serviceName, namespaceId, aggregation);
 
             int start = (pageNo - 1) * pageSize;
-            int end = start + pageSize;
-
-            int count = subscribers.size();
-
             if (start < 0) {
                 start = 0;
             }
 
+            int end = start + pageSize;
+            int count = subscribers.size();
             if (end > count) {
                 end = count;
             }