aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-03 00:18:07 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-03 00:18:07 +0100
commit4a809146030e578de1871087108fcd3a276e5369 (patch)
treee43a819f0c4649087ba6c85a9fd3692dc8a61582 /src
parent138345c5bf4cb2a05616d17561f9aaf2c587717a (diff)
fixed another npe in hasBookmark
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Account.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 1d0a025f7..538d0ec2e 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -372,8 +372,9 @@ public class Account extends AbstractEntity {
}
public boolean hasBookmarkFor(final Jid conferenceJid) {
- for (Bookmark bmark : this.bookmarks) {
- if (bmark.getJid().equals(conferenceJid.toBareJid())) {
+ for (Bookmark bookmark : this.bookmarks) {
+ final Jid jid = bookmark.getJid();
+ if (jid != null && jid.equals(conferenceJid.toBareJid())) {
return true;
}
}