diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-12-03 00:18:07 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-12-03 00:18:07 +0100 |
| commit | 4a809146030e578de1871087108fcd3a276e5369 (patch) | |
| tree | e43a819f0c4649087ba6c85a9fd3692dc8a61582 | |
| parent | 138345c5bf4cb2a05616d17561f9aaf2c587717a (diff) | |
fixed another npe in hasBookmark
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Account.java | 5 |
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 1d0a025f..538d0ec2 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; } } |