Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +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,9 +72,10 @@ 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()) {
final UnverifiedBatch b = proto.readBatch(); final UnverifiedBatch b = proto.readBatch();
@@ -90,9 +91,10 @@ 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()) {
final SubscriptionUpdate s = proto.readSubscriptionUpdate(); final SubscriptionUpdate s = proto.readSubscriptionUpdate();
@@ -105,9 +107,10 @@ 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()) {
final TransportUpdate t = proto.readTransportUpdate(); final TransportUpdate t = proto.readTransportUpdate();
@@ -120,9 +123,10 @@ 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 {
throw new FormatException(); throw new FormatException();

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

@@ -140,9 +140,10 @@ 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()) {
final UnverifiedBatch b = proto.readBatch(); final UnverifiedBatch b = proto.readBatch();
@@ -158,9 +159,10 @@ 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()) {
Offer o = proto.readOffer(); Offer o = proto.readOffer();
@@ -200,9 +202,10 @@ 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
synchronized(this) { synchronized(this) {
@@ -223,9 +226,10 @@ 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()) {
final TransportUpdate t = proto.readTransportUpdate(); final TransportUpdate t = proto.readTransportUpdate();
@@ -238,9 +242,10 @@ 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 {
throw new FormatException(); throw new FormatException();