diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-09 16:47:31 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-09 16:47:31 +0100 |
| commit | ad6fef063ba152d19c1a08590da7996051bcd836 (patch) | |
| tree | 35f0f453602e528bdec3e760c056d4a47b9658fc /src/main/java/eu/siacs/conversations/entities/Message.java | |
| parent | 377bd49ee807b9a06089ad5612ca15b9b00f2e36 (diff) | |
fixed null pointer in message merger
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Message.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 550474bb..421f20f0 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -307,6 +307,7 @@ public class Message extends AbstractEntity { && message.getEncryption() != Message.ENCRYPTION_PGP && this.getType() == message.getType() && this.getEncryption() == message.getEncryption() + && this.getCounterpart() != null && this.getCounterpart().equals(message.getCounterpart()) && (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && ((this .getStatus() == message.getStatus() || ((this.getStatus() == Message.STATUS_SEND || this |