From e99d42e0acdfa46528845af69e89c18f75404aa0 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 19 Feb 2013 19:18:53 +0000
Subject: [PATCH] Closing the socket on shutdown sometimes causes a crash;
don't close it.
---
.../src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java b/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
index 275f968c15..34d1c09ac6 100644
--- a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
@@ -63,7 +63,6 @@ class DroidtoothPlugin implements DuplexPlugin {
private final long maxLatency, pollingInterval;
private volatile boolean running = false;
- private volatile BluetoothServerSocket socket = null;
// Non-null if running has ever been true
private volatile BluetoothAdapter adapter = null;
@@ -141,7 +140,6 @@ class DroidtoothPlugin implements DuplexPlugin {
tryToClose(ss);
return;
}
- socket = ss;
acceptContactConnections(ss);
}
@@ -196,7 +194,6 @@ class DroidtoothPlugin implements DuplexPlugin {
public void stop() {
running = false;
- if(socket != null) tryToClose(socket);
}
public boolean shouldPoll() {
--
GitLab