From a02ca4b3567dda3c2bbdf5bc730cb6fd2487d315 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 11 Mar 2013 10:31:31 +0000
Subject: [PATCH] Close invitation connections after use.
---
briar-core/src/net/sf/briar/invitation/AliceConnector.java | 2 ++
briar-core/src/net/sf/briar/invitation/BobConnector.java | 2 ++
briar-core/src/net/sf/briar/invitation/Connector.java | 1 +
3 files changed, 5 insertions(+)
diff --git a/briar-core/src/net/sf/briar/invitation/AliceConnector.java b/briar-core/src/net/sf/briar/invitation/AliceConnector.java
index 044c3d917a..84d486d19d 100644
--- a/briar-core/src/net/sf/briar/invitation/AliceConnector.java
+++ b/briar-core/src/net/sf/briar/invitation/AliceConnector.java
@@ -97,5 +97,7 @@ class AliceConnector extends Connector {
Thread.currentThread().interrupt();
return;
}
+ // That's all, folks!
+ tryToClose(conn, false);
}
}
\ No newline at end of file
diff --git a/briar-core/src/net/sf/briar/invitation/BobConnector.java b/briar-core/src/net/sf/briar/invitation/BobConnector.java
index cf21e24b26..10c15bfe78 100644
--- a/briar-core/src/net/sf/briar/invitation/BobConnector.java
+++ b/briar-core/src/net/sf/briar/invitation/BobConnector.java
@@ -97,5 +97,7 @@ class BobConnector extends Connector {
Thread.currentThread().interrupt();
return;
}
+ // That's all, folks!
+ tryToClose(conn, false);
}
}
diff --git a/briar-core/src/net/sf/briar/invitation/Connector.java b/briar-core/src/net/sf/briar/invitation/Connector.java
index 5ec5f0520c..67895642f3 100644
--- a/briar-core/src/net/sf/briar/invitation/Connector.java
+++ b/briar-core/src/net/sf/briar/invitation/Connector.java
@@ -90,6 +90,7 @@ abstract class Connector extends Thread {
protected void tryToClose(DuplexTransportConnection conn,
boolean exception) {
try {
+ if(LOG.isLoggable(INFO)) LOG.info("Closing connection");
conn.dispose(exception, true);
} catch(IOException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
--
GitLab