diff options
| author | Damian Minkov <damencho@jitsi.org> | 2013-08-27 17:59:56 +0300 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2013-08-27 18:07:20 +0300 |
| commit | 9105fe7a21bf8dad18b956f335659fa95898626c (patch) | |
| tree | 28fb9a8a68d0135e2a21c4473b90f90ed4448279 | |
| parent | 82d00a32fdbb5cda794ddf13efb170f659bef3a7 (diff) | |
| download | jitsi-9105fe7a21bf8dad18b956f335659fa95898626c.zip jitsi-9105fe7a21bf8dad18b956f335659fa95898626c.tar.gz jitsi-9105fe7a21bf8dad18b956f335659fa95898626c.tar.bz2 | |
Fixes a problem where history messages from chatroom are sometimes duplicated in the ui.
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java index dcd2038..8625dbe 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java @@ -265,7 +265,8 @@ public class ConferenceChatManager { ChatRoomMessageDeliveredEvent ev = (ChatRoomMessageDeliveredEvent) o; - if (evt.getTimestamp() == ev.getTimestamp()) + if (evt.getTimestamp() != null + && evt.getTimestamp().equals(ev.getTimestamp())) { isPresent = true; break; @@ -275,7 +276,8 @@ public class ConferenceChatManager { ChatRoomMessageReceivedEvent ev = (ChatRoomMessageReceivedEvent) o; - if (evt.getTimestamp() == ev.getTimestamp()) + if (evt.getTimestamp() != null + && evt.getTimestamp().equals(ev.getTimestamp())) { isPresent = true; break; |