Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

You can't use an AtomicBoolean as a semaphore.

Browse Source
This commit is contained in:
akwizgran
2012-11-24 12:32:45 +00:00
parent 9a3157c3e6
commit dc932764ec
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/sf/briar/plugins/modem/ModemImpl.java
View File

@@ -11,6 +11,7 @@ import java.io.OutputStream;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -33,7 +34,8 @@ class ModemImpl implements Modem, SerialPortEventListener {
private final Executor executor; private final Executor executor;
private final Callback callback; private final Callback callback;
private final SerialPort port; private final SerialPort port;
private final AtomicBoolean initialised, offHook, connected; private final AtomicBoolean initialised, connected;
private final Semaphore offHook;
private final BlockingQueue<byte[]> received; private final BlockingQueue<byte[]> received;
private final byte[] line; private final byte[] line;
@@ -45,7 +47,7 @@ class ModemImpl implements Modem, SerialPortEventListener {
this.callback = callback; this.callback = callback;
port = new SerialPort(portName); port = new SerialPort(portName);
initialised = new AtomicBoolean(false); initialised = new AtomicBoolean(false);
offHook = new AtomicBoolean(false); offHook = new Semaphore(1);
connected = new AtomicBoolean(false); connected = new AtomicBoolean(false);
received = new LinkedBlockingQueue<byte[]>(); received = new LinkedBlockingQueue<byte[]>();
line = new byte[MAX_LINE_LENGTH]; line = new byte[MAX_LINE_LENGTH];
@@ -94,7 +96,7 @@ class ModemImpl implements Modem, SerialPortEventListener {
} }
public boolean dial(String number) throws IOException { public boolean dial(String number) throws IOException {
if(offHook.getAndSet(true)) { if(!offHook.tryAcquire()) {
if(LOG.isLoggable(INFO)) if(LOG.isLoggable(INFO))
LOG.info("Not dialling - call in progress"); LOG.info("Not dialling - call in progress");
return false; return false;
@@ -140,7 +142,7 @@ class ModemImpl implements Modem, SerialPortEventListener {
} }
received.add(new byte[0]); // Empty buffer indicates EOF received.add(new byte[0]); // Empty buffer indicates EOF
connected.set(false); connected.set(false);
offHook.set(false); offHook.release();
} }
public void serialEvent(SerialPortEvent ev) { public void serialEvent(SerialPortEvent ev) {
@@ -208,7 +210,7 @@ class ModemImpl implements Modem, SerialPortEventListener {
} }
private void answer() throws IOException { private void answer() throws IOException {
if(offHook.getAndSet(true)) { if(offHook.tryAcquire()) {
if(LOG.isLoggable(INFO)) if(LOG.isLoggable(INFO))
LOG.info("Not answering - call in progress"); LOG.info("Not answering - call in progress");
return; return;