fix MailboxProtocol termination

bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxProtocol.java

@@ -98,6 +98,7 @@ public class MailboxProtocol implements Runnable {
 				writingThread.interrupt();
 				if (LOG.isLoggable(INFO))
 					LOG.info(e.toString());
+				terminatePendingRequests();
 			}
 		}
 	}
@@ -119,9 +120,10 @@ public class MailboxProtocol implements Runnable {
 			}
 		} catch (IOException | InterruptedException e) {
 			if (aborted.compareAndSet(false, true)) {
-				writingThread.interrupt();
+				readingThread.interrupt();
 				if (LOG.isLoggable(INFO))
 					LOG.info(e.toString());
+				terminatePendingRequests();
 			}
 		}
 	}
@@ -178,11 +180,11 @@ public class MailboxProtocol implements Runnable {
 		}
 	}
 
-	public void stop() throws IOException {
+	public void stop() {
 		if (aborted.compareAndSet(false, true)) {
 			readingThread.interrupt();
 			writingThread.interrupt();
-			mailboxBdfReader.close();
+			terminatePendingRequests();
 		}
 	}