From 3833eac4e20b422ea05d066a49e8bdc26e91ea09 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 13 Jun 2013 11:50:01 +0100
Subject: [PATCH] Made two private classes static.
---
.../net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java | 6 +++---
1 file changed, 3 insertions(+), 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 b2d6bbab78..d20cb746a7 100644
--- a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
@@ -493,7 +493,7 @@ class DroidtoothPlugin implements DuplexPlugin {
}
}
- private class DiscoveryReceiver extends BroadcastReceiver {
+ private static class DiscoveryReceiver extends BroadcastReceiver {
private final CountDownLatch finished = new CountDownLatch(1);
private final List<String> addresses = new ArrayList<String>();
@@ -517,7 +517,7 @@ class DroidtoothPlugin implements DuplexPlugin {
}
}
- private class BluetoothListenerThread extends Thread {
+ private static class BluetoothListenerThread extends Thread {
private final SocketReceiver receiver;
private final BluetoothServerSocket serverSocket;
@@ -536,7 +536,7 @@ class DroidtoothPlugin implements DuplexPlugin {
if(!receiver.setSocket(s)) {
if(LOG.isLoggable(INFO))
LOG.info("Closing redundant connection");
- tryToClose(s);
+ s.close();
}
} catch(IOException e) {
// This is expected when the socket is closed
--
GitLab