From 86dddfd85f893e86a9fa59b9532ecdf0d0ab6cba Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Mon, 11 May 2020 08:33:09 +0800
Subject: [PATCH] fix build error

---
 .../io/moquette/persistence/MemoryMessagesStore.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
index 32a0ec66..34591bd3 100755
--- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -2148,8 +2148,14 @@ public class MemoryMessagesStore implements IMessagesStore {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
 
         if(request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
-            Collection<FriendData> friendDatas = getFriendDatas(hzInstance, userId);
-            for (FriendData fd : friendDatas) {
+            MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+
+            Collection<FriendData> friends = friendsMap.get(userId);
+            if (friends == null || friends.size() == 0) {
+                friends = loadFriend(friendsMap, userId);
+            }
+
+            for (FriendData fd : friends) {
                 if (fd.getFriendUid().equals(request.getTargetUid())) {
                     if (fd.getState() == 0) {
                         return ErrorCode.ERROR_CODE_ALREADY_FRIENDS;
@@ -2160,8 +2166,6 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        IMap<String, Boolean> friendEmpty = hzInstance.getMap(USER_FRIENDS_EMPTY);
-
         if (isAdmin) {
             MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);