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

代码优化

Browse Source
This commit is contained in:
heavyrain.lee
2019-06-01 12:06:51 +08:00
committed by heavyrain lee
parent d0671c1682
commit 5714a9a1d3
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
-11
View File
@@ -319,9 +319,6 @@ public class MemoryMessagesStore implements IMessagesStore {
long targetMessageId = entry.getValue();
MessageBundle bundle = mIMap.get(targetMessageId);
if (bundle == null) {
bundle = databaseStore.getMessage(targetMessageId);
}
if (bundle != null) {
if (exceptClientId == null || !exceptClientId.equals(bundle.getFromClientId()) || !user.equals(bundle.getFromUser())) {
@@ -411,10 +408,6 @@ public class MemoryMessagesStore implements IMessagesStore {
long targetMessageId = entry.getValue();
MessageBundle bundle = mIMap.get(targetMessageId);
if (bundle == null) {
bundle = databaseStore.getMessage(targetMessageId);
}
if (bundle != null) {
if (exceptClientId == null || !exceptClientId.equals(bundle.getFromClientId()) || !fromUser.equals(bundle.getFromUser())) {
size += bundle.getMessage().getSerializedSize();
@@ -2115,10 +2108,6 @@ public class MemoryMessagesStore implements IMessagesStore {
MessageBundle bundle = mIMap.get(messageId);
if (bundle != null) {
return bundle.getMessage();
} else {
bundle = databaseStore.getMessage(messageId);
if (bundle != null)
return bundle.getMessage();
}
return null;
}
broker/src/main/java/win/liyufan/im/MessageBundle.java
+5
View File
@@ -65,6 +65,11 @@ public class MessageBundle implements Serializable {
}
public void setMessage(WFCMessage.Message message) {
this.fromUser = message.getFromUser();
this.type = message.getConversation().getType();
this.targetId = message.getConversation().getTarget();
this.line = message.getConversation().getLine();
this.message = message;
this.messageId = message.getMessageId();
}
}