mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-10 15:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't send daemon disconnected on thread interrupted

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2015-01-11 22:20:58 +00:00
parent 9461a321be
commit 2001ebf1de
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/android/com/bluekitchen/btstack/SocketConnectionUnix.java
View File

@ -42,7 +42,7 @@ public class SocketConnectionUnix extends SocketConnection {
* @see com.bluekitchen.btstack.SocketConnection#sendPacket(com.bluekitchen.btstack.Packet)
*/
@Override
public boolean sendPacket(Packet packet) {
public synchronized boolean sendPacket(Packet packet) {
if (out == null) return false;

10
java/src/com/bluekitchen/btstack/BTstackClient.java
View File

@ -69,8 +69,11 @@ public class BTstackClient {
rxThread = new Thread(new Runnable(){
@Override
public void run() {
while (socketConnection != null && !Thread.currentThread().isInterrupted()){
while (socketConnection != null){
Packet packet = socketConnection.receivePacket();
if (Thread.currentThread().isInterrupted()){
return;
}
if (packet == null) {
// server disconnected
System.out.println("Rx Thread: Daemon Disconnected");
@ -116,8 +119,13 @@ public class BTstackClient {
public void disconnect(){
if (socketConnection == null) return;
if (rxThread == null) return;
// signal rx thread to stop
rxThread.interrupt();
// wait for thread stopped
rxThread.join();
// disconnect socket
socketConnection.disconnect();
// done
socketConnection = null;
}
}

2
java/src/com/bluekitchen/btstack/SocketConnectionTCP.java
View File

@ -43,7 +43,7 @@ public class SocketConnectionTCP extends SocketConnection {
* @see com.bluekitchen.btstack.SocketConnection#sendPacket(com.bluekitchen.btstack.Packet)
*/
@Override
public boolean sendPacket(Packet packet) {
public synchronized boolean sendPacket(Packet packet) {
if (out == null) return false;