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

If the reader detects a clean close, let the writer finish and close

Browse Source 
cleanly.
This commit is contained in:
akwizgran
2011-12-10 16:53:04 +00:00
parent f2de23854e
commit cbc5fd1bb4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/net/sf/briar/protocol/stream/StreamConnection.java
View File

@@ -113,7 +113,9 @@ abstract class StreamConnection implements DatabaseListener {
dbExecutor.execute(new GenerateAcks()); dbExecutor.execute(new GenerateAcks());
} else if(e instanceof ContactRemovedEvent) { } else if(e instanceof ContactRemovedEvent) {
ContactId c = ((ContactRemovedEvent) e).getContactId(); ContactId c = ((ContactRemovedEvent) e).getContactId();
if(contactId.equals(c)) writerTasks.add(CLOSE); if(contactId.equals(c)) {
if(!disposed.getAndSet(true)) transport.dispose(false, true);
}
} else if(e instanceof MessagesAddedEvent) { } else if(e instanceof MessagesAddedEvent) {
if(canSendOffer.getAndSet(false)) if(canSendOffer.getAndSet(false))
dbExecutor.execute(new GenerateOffer()); dbExecutor.execute(new GenerateOffer());
@@ -172,8 +174,8 @@ abstract class StreamConnection implements DatabaseListener {
throw new FormatException(); throw new FormatException();
} }
} }
// The writer will dispose of the transport
writerTasks.add(CLOSE); writerTasks.add(CLOSE);
if(!disposed.getAndSet(true)) transport.dispose(false, true);
} catch(DbException e) { } catch(DbException e) {
if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.toString()); if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.toString());
if(!disposed.getAndSet(true)) transport.dispose(true, true); if(!disposed.getAndSet(true)) transport.dispose(true, true);