fixed another npe in hasBookmark

iNPUTmice created 11 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Account.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Detailed changes

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;
 			}
 		}