Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Ensure semaphore is released if an exception is thrown.

Browse Source
This commit is contained in:
akwizgran
2011-12-06 00:03:05 +00:00
parent f474ed229d
commit 00df158ad6
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/net/sf/briar/transport/batch/IncomingBatchConnection.java
View File

@@ -72,8 +72,9 @@ class IncomingBatchConnection {
} catch(DbException e) { } catch(DbException e) {
if(LOG.isLoggable(Level.WARNING)) if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} finally {
semaphore.release();
} }
semaphore.release();
} }
}); });
} else if(proto.hasBatch()) { } else if(proto.hasBatch()) {
@@ -90,8 +91,9 @@ class IncomingBatchConnection {
} catch(GeneralSecurityException e) { } catch(GeneralSecurityException e) {
if(LOG.isLoggable(Level.WARNING)) if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} finally {
semaphore.release();
} }
semaphore.release();
} }
}); });
} else if(proto.hasSubscriptionUpdate()) { } else if(proto.hasSubscriptionUpdate()) {
@@ -105,8 +107,9 @@ class IncomingBatchConnection {
} catch(DbException e) { } catch(DbException e) {
if(LOG.isLoggable(Level.WARNING)) if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} finally {
semaphore.release();
} }
semaphore.release();
} }
}); });
} else if(proto.hasTransportUpdate()) { } else if(proto.hasTransportUpdate()) {
@@ -120,8 +123,9 @@ class IncomingBatchConnection {
} catch(DbException e) { } catch(DbException e) {
if(LOG.isLoggable(Level.WARNING)) if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} finally {
semaphore.release();
} }
semaphore.release();
} }
}); });
} else { } else {

15
components/net/sf/briar/transport/stream/StreamConnection.java
View File

@@ -140,8 +140,9 @@ abstract class StreamConnection implements DatabaseListener {
} catch(DbException e) { } catch(DbException e) {
if(LOG.isLoggable(Level.WARNING)) if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} finally {
semaphore.release();
} }
semaphore.release();
} }
}); });
} else if(proto.hasBatch()) { } else if(proto.hasBatch()) {
@@ -158,8 +159,9 @@ abstract class StreamConnection implements DatabaseListener {
} catch(GeneralSecurityException e) { } catch(GeneralSecurityException e) {
if(LOG.isLoggable(Level.WARNING)) if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} finally {
semaphore.release();
} }
semaphore.release();
} }
}); });
} else if(proto.hasOffer()) { } else if(proto.hasOffer()) {
@@ -200,8 +202,9 @@ abstract class StreamConnection implements DatabaseListener {
} catch(DbException e) { } catch(DbException e) {
if(LOG.isLoggable(Level.WARNING)) if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} finally {
semaphore.release();
} }
semaphore.release();
} }
}); });
// Store the requested message IDs and notify the writer // Store the requested message IDs and notify the writer
@@ -223,8 +226,9 @@ abstract class StreamConnection implements DatabaseListener {
} catch(DbException e) { } catch(DbException e) {
if(LOG.isLoggable(Level.WARNING)) if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} finally {
semaphore.release();
} }
semaphore.release();
} }
}); });
} else if(proto.hasTransportUpdate()) { } else if(proto.hasTransportUpdate()) {
@@ -238,8 +242,9 @@ abstract class StreamConnection implements DatabaseListener {
} catch(DbException e) { } catch(DbException e) {
if(LOG.isLoggable(Level.WARNING)) if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} finally {
semaphore.release();
} }
semaphore.release();
} }
}); });
} else { } else {