From 9f11e96043386105ccdb460e996c330fc30e5cb9 Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Tue, 4 Sep 2018 11:50:43 +0200
Subject: [PATCH] cleanup MailboxManager
---
.../bramble/mailbox/MailboxManagerImpl.java | 25 +++++++++----------
1 file changed, 12 insertions(+), 13 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 582788dcdb..5caa90198b 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
@@ -174,16 +174,16 @@ public class MailboxManagerImpl implements MailboxManager {
ioExecutor.execute(mailboxProtocol);
- try {
- mailboxSession.run();
- mailboxProtocol.stop();
- disposeConnection(false);
- } catch (IOException e) {
- logException(LOG, WARNING, e);
- } finally {
- connectionRegistry
- .unregisterConnection(contactId, MailboxConstants.ID, incoming);
- }
+
+ mailboxSession.run();
+ mailboxProtocol.stop();
+
+ disposeConnection(false);
+
+ connectionRegistry
+ .unregisterConnection(contactId, MailboxConstants.ID,
+ incoming);
+
}
private void handleOutgoingStream() throws DbException, IOException {
@@ -221,10 +221,10 @@ public class MailboxManagerImpl implements MailboxManager {
throw new IOException(
"Unrecognised tag for returning stream");
- if (!incomingCtx.getContactId().equals(contactId)) {
+ if (!incomingCtx.getContactId().equals(contactId))
throw new IOException(
"ContactId for Incoming stream does not match expected ContactId");
- }
+
}
private void handleIncomingStream() throws IOException {
@@ -238,7 +238,6 @@ public class MailboxManagerImpl implements MailboxManager {
}
private void disposeConnection(boolean exception) {
- // Interrupt the outgoing session so it finishes cleanly
try {
reader.dispose(exception, incomingCtx != null);
writer.dispose(exception);
--
GitLab