narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed npe in error message handling

Browse source
This commit is contained in:
Daniel Gultsch 2015-07-21 19:44:25 +02:00
parent 0d679a7abb
commit f6281a182d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -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();
}
}