From fe9c3adc646d5dbc570648d3c95791949c0befc7 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 7 Mar 2016 12:17:00 +0000
Subject: [PATCH] Raise interrupt flag when catching InterruptedException.
---
.../org/briarproject/plugins/droidtooth/DroidtoothPlugin.java | 3 ++-
.../org/briarproject/plugins/bluetooth/BluetoothPlugin.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
index 16d40d43a9..325a49d74f 100644
--- a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
@@ -376,7 +376,8 @@ class DroidtoothPlugin implements DuplexPlugin {
chosen = f.get();
return new DroidtoothTransportConnection(this, chosen);
} catch (InterruptedException e) {
- LOG.info("Interrupted while waiting for connection");
+ LOG.info("Interrupted while exchanging invitations");
+ Thread.currentThread().interrupt();
return null;
} catch (ExecutionException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
diff --git a/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java b/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
index 669965f0d3..79e289c39c 100644
--- a/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
+++ b/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
@@ -294,7 +294,8 @@ class BluetoothPlugin implements DuplexPlugin {
chosen = f.get();
return new BluetoothTransportConnection(this, chosen);
} catch (InterruptedException e) {
- LOG.info("Interrupted while waiting for connection");
+ LOG.info("Interrupted while exchanging invitations");
+ Thread.currentThread().interrupt();
return null;
} catch (ExecutionException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
--
GitLab