Update MessageService.java

roundshoulder · Nov 24, 2022 · 4999669 · 4999669
1 parent 879188b
commit 4999669
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/com/project/csletter/message/service/MessageService.java b/src/main/java/com/project/csletter/message/service/MessageService.java
@@ -132,8 +132,10 @@ public List<MessageListResponse> getMessageFeed(Long cursor, Pageable pageable,
             f.setNextCursor(mainList.get(mainList.size()-1).getMessageId());
         });
 
-        if(!mainList.get(mainList.size() - 1).getHaveNextMessage()) {
-            mainList.forEach(f -> f.setNextCursor(null));
+        if (mainList.size() > 0) {
+            if(!mainList.get(mainList.size() - 1).getHaveNextMessage()) {
+                mainList.forEach(f -> f.setNextCursor(null));
+            }
         }
 
         return mainList;