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

Ensure the semaphore is released if a RuntimeException is thrown.

Browse Source
This commit is contained in:
akwizgran
2012-12-16 00:16:19 +00:00
parent 7887331d1c
commit a7acec8f72
1 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
View File

@@ -137,13 +137,15 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
LOG.info("Previous poll still in progress"); LOG.info("Previous poll still in progress");
return; return;
} }
try {
// Get the ISO 3166 code for the caller's country // Get the ISO 3166 code for the caller's country
String callerIso = callback.getLocalProperties().get("iso3166"); String callerIso = callback.getLocalProperties().get("iso3166");
if(StringUtils.isNullOrEmpty(callerIso)) return; if(StringUtils.isNullOrEmpty(callerIso)) return;
// Call contacts one at a time in a random order // Call contacts one at a time in a random order
Map<ContactId, TransportProperties> remote = Map<ContactId, TransportProperties> remote =
callback.getRemoteProperties(); callback.getRemoteProperties();
List<ContactId> contacts = new ArrayList<ContactId>(remote.keySet()); List<ContactId> contacts =
new ArrayList<ContactId>(remote.keySet());
Collections.shuffle(contacts); Collections.shuffle(contacts);
Iterator<ContactId> it = contacts.iterator(); Iterator<ContactId> it = contacts.iterator();
while(it.hasNext() && running) { while(it.hasNext() && running) {
@@ -163,7 +165,8 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
try { try {
if(!modem.dial(number)) continue; if(!modem.dial(number)) continue;
} catch(IOException e) { } catch(IOException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e); if(LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
if(resetModem()) continue; if(resetModem()) continue;
break; break;
} }
@@ -179,8 +182,10 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
break; break;
} }
} }
} finally {
polling.release(); polling.release();
} }
}
public DuplexTransportConnection createConnection(ContactId c) { public DuplexTransportConnection createConnection(ContactId c) {
if(!running) return null; if(!running) return null;