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

fixed another npe in hasBookmark

Browse source
This commit is contained in:
iNPUTmice 2014-12-03 00:18:07 +01:00
parent 138345c5bf
commit 4a80914603
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/entities/Account.java
View file

@ -372,8 +372,9 @@ public class Account extends AbstractEntity {
} }
public boolean hasBookmarkFor(final Jid conferenceJid) { public boolean hasBookmarkFor(final Jid conferenceJid) {
for (Bookmark bmark : this.bookmarks) { for (Bookmark bookmark : this.bookmarks) {
if (bmark.getJid().equals(conferenceJid.toBareJid())) { final Jid jid = bookmark.getJid();
if (jid != null && jid.equals(conferenceJid.toBareJid())) {
return true; return true;
} }
} }