From bc83bbc315226b319439b426f5eb0766061bfab3 Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Mon, 17 Sep 2018 17:19:21 +0200
Subject: [PATCH] fix missing null check
---
.../briarproject/bramble/mailbox/MailboxServiceImpl.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxServiceImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxServiceImpl.java
index d9a639539..7c9604cf8 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxServiceImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxServiceImpl.java
@@ -4,6 +4,7 @@ import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.contact.ContactType;
+import org.briarproject.bramble.api.contact.PrivateMailbox;
import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DbException;
@@ -95,7 +96,9 @@ public class MailboxServiceImpl implements MailboxService, EventListener {
LOG.info("Starting Mailbox Service");
try {
- privateMailboxId = contactManager.getPrivateMailbox().getId();
+ PrivateMailbox mb = contactManager.getPrivateMailbox();
+ if (mb!=null)
+ privateMailboxId = mb.getId();
} catch (DbException e1) {
if (LOG.isLoggable(WARNING))
LOG.info(e1.toString());
@@ -129,7 +132,9 @@ public class MailboxServiceImpl implements MailboxService, EventListener {
if (hasPrivateMailbox.get())
return;
try {
- privateMailboxId = contactManager.getPrivateMailbox().getId();
+ PrivateMailbox mb = contactManager.getPrivateMailbox();
+ if (mb!=null)
+ privateMailboxId = mb.getId();
} catch (DbException e1) {
if (LOG.isLoggable(WARNING))
LOG.info(e1.toString());
--
GitLab