diff --git a/src/main/java/org/ntlab/tampoposerver/services/FriendService.java b/src/main/java/org/ntlab/tampoposerver/services/FriendService.java index f2372ba..58ca363 100644 --- a/src/main/java/org/ntlab/tampoposerver/services/FriendService.java +++ b/src/main/java/org/ntlab/tampoposerver/services/FriendService.java @@ -58,7 +58,7 @@ for (FriendRequest request : allRequests) { User sender = userRepository.getUser(request.getSenderId()); User receiver = userRepository.getUser(request.getReceiverId()); - if (sender.getToken().equals(token) || receiver.getToken().equals(token)) { + if ((sender.getToken() != null && sender.getToken().equals(token)) || (receiver.getToken() != null && receiver.getToken().equals(token))) { results.add(request); } }