From 5857a3fbd1f1a9267b1e26ed526bd5108f07b1c5 Mon Sep 17 00:00:00 2001 From: heavyrain2012 Date: Fri, 12 Feb 2021 18:01:55 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=90=8C=E6=AD=A5=E7=BE=A4=E6=88=90?= =?UTF-8?q?=E5=91=98=E7=8A=B6=E6=80=81=EF=BC=8C=E5=BD=93=E7=BE=A4=E6=88=90?= =?UTF-8?q?=E5=91=98=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ae4d8a95babf48f7f860f9a3066df1ef4845dbab. --- .../io/moquette/persistence/MemoryMessagesStore.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index 4f096e50..cb8f3422 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -1549,9 +1549,7 @@ public class MemoryMessagesStore implements IMessagesStore { WFCMessage.GroupInfo groupInfo = mIMap.get(groupId); if (groupInfo == null) { - WFCMessage.GroupMember deletedMember = WFCMessage.GroupMember.newBuilder().setMemberId(fromUser).setType(GroupMemberType_Removed).setUpdateDt(System.currentTimeMillis()).build(); - members.add(deletedMember); - return ErrorCode.ERROR_CODE_SUCCESS; + return ErrorCode.ERROR_CODE_NOT_EXIST; } else if (groupInfo.getMemberUpdateDt() <= maxDt) { return ErrorCode.ERROR_CODE_NOT_MODIFIED; } @@ -1583,10 +1581,7 @@ public class MemoryMessagesStore implements IMessagesStore { if (fromUser != null && notInGroup) { members.clear(); if (self != null) { - members.add(self); - } else { - WFCMessage.GroupMember deletedMember = WFCMessage.GroupMember.newBuilder().setMemberId(fromUser).setType(GroupMemberType_Removed).setUpdateDt(System.currentTimeMillis()).build(); - members.add(deletedMember); + members.add(self.toBuilder().setUpdateDt(0).setType(GroupMemberType_Removed).build()); } }