aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-07-21 19:44:25 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-07-21 19:44:25 +0200
commitf6281a182df6e251a326538702bf4f3b6f80a62b (patch)
treecee7264d52d6963720455f9b14afb929acb9d81e /src/main/java/eu
parent0d679a7abbaadaf8eb307b5653fbbd0fdae7538e (diff)
fixed npe in error message handling
Diffstat (limited to 'src/main/java/eu')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index b81a62da6..c2fdf5b8a 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -206,7 +206,7 @@ public class MessageParser extends AbstractParser implements
from.toBareJid(),
packet.getId(),
Message.STATUS_SEND_FAILED);
- if (message.getEncryption() == Message.ENCRYPTION_OTR) {
+ if (message != null && message.getEncryption() == Message.ENCRYPTION_OTR) {
message.getConversation().endOtrIfNeeded();
}
}