From 48ba076cc1d54d3df39d3e96201b875b22cd37da Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Fri, 28 Sep 2018 14:17:29 +0200
Subject: [PATCH] Fix transport ID's and nullpointer exception
---
.../org/briarproject/bramble/mailbox/MailboxManagerImpl.java | 5 ++---
.../bramble/mailbox/sessions/AbstractMailboxSession.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
index 26405cfd2..67acd561e 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
@@ -89,7 +89,7 @@ public class MailboxManagerImpl implements MailboxManager {
}
ioExecutor.execute(
new ManageMailboxConnection(transportId, connection,
- ContactType.PRIVATE_MAILBOX, contactId, null));
+ ContactType.PRIVATE_MAILBOX, contactId, contactId));
}
@Override
@@ -221,8 +221,7 @@ public class MailboxManagerImpl implements MailboxManager {
private void handleOutgoingStream()
throws DbException, IOException {
// Allocate a stream context
- StreamContext ctx =
- keyManager.getStreamContext(mailboxId, transportId);
+ StreamContext ctx = keyManager.getStreamContext(mailboxId, transportId);
if (ctx == null)
throw new IOException("Unable to allocate stream context");
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java
index 5ca81fb5b..f6f82d598 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java
@@ -295,7 +295,7 @@ public abstract class AbstractMailboxSession implements MailboxSession {
}
StreamContext ctx =
- keyManager.getStreamContext(MailboxConstants.ID, tag);
+ keyManager.getStreamContext(LanTcpConstants.ID, tag);
if (ctx == null)
throw new IOException(
--
GitLab