anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build error

Browse Source
This commit is contained in:
imhao183
2020-05-11 08:33:09 +08:00
parent db733efc44
commit 86dddfd85f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+8 -4
View File
@@ -2148,8 +2148,14 @@ public class MemoryMessagesStore implements IMessagesStore {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
if(request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) { if(request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
Collection<FriendData> friendDatas = getFriendDatas(hzInstance, userId); MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
for (FriendData fd : friendDatas) {
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.getFriendUid().equals(request.getTargetUid())) {
if (fd.getState() == 0) { if (fd.getState() == 0) {
return ErrorCode.ERROR_CODE_ALREADY_FRIENDS; 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) { if (isAdmin) {
MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS); MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);