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

Throw checked exception if concurrent attempts are made to remove a

Browse Source 
contact.
This commit is contained in:
akwizgran
2011-11-15 09:51:51 +00:00
parent 6fd8493d3d
commit effa5c9d8e
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -1229,6 +1229,7 @@ DatabaseCleaner.Callback {
if(LOG.isLoggable(Level.FINE)) LOG.fine("Removing contact " + c); if(LOG.isLoggable(Level.FINE)) LOG.fine("Removing contact " + c);
contactLock.writeLock().lock(); contactLock.writeLock().lock();
try { try {
if(!containsContact(c)) throw new NoSuchContactException();
messageLock.writeLock().lock(); messageLock.writeLock().lock();
try { try {
messageFlagLock.writeLock().lock(); messageFlagLock.writeLock().lock();

23
test/net/sf/briar/db/DatabaseComponentTest.java
View File

@@ -183,6 +183,8 @@ public abstract class DatabaseComponentTest extends TestCase {
oneOf(database).setConnectionWindow(txn, contactId, remoteIndex, oneOf(database).setConnectionWindow(txn, contactId, remoteIndex,
connectionWindow); connectionWindow);
// removeContact(contactId) // removeContact(contactId)
oneOf(database).containsContact(txn, contactId);
will(returnValue(true));
oneOf(database).removeContact(txn, contactId); oneOf(database).removeContact(txn, contactId);
oneOf(listener).eventOccurred(with(any(ContactRemovedEvent.class))); oneOf(listener).eventOccurred(with(any(ContactRemovedEvent.class)));
// close() // close()
@@ -502,11 +504,11 @@ public abstract class DatabaseComponentTest extends TestCase {
context.mock(TransportUpdate.class); context.mock(TransportUpdate.class);
context.checking(new Expectations() {{ context.checking(new Expectations() {{
// Check whether the contact is still in the DB (which it's not) // Check whether the contact is still in the DB (which it's not)
exactly(17).of(database).startTransaction(); exactly(20).of(database).startTransaction();
will(returnValue(txn)); will(returnValue(txn));
exactly(17).of(database).containsContact(txn, contactId); exactly(20).of(database).containsContact(txn, contactId);
will(returnValue(false)); will(returnValue(false));
exactly(17).of(database).commitTransaction(txn); exactly(20).of(database).commitTransaction(txn);
}}); }});
DatabaseComponent db = createDatabaseComponent(database, cleaner); DatabaseComponent db = createDatabaseComponent(database, cleaner);
@@ -546,11 +548,21 @@ public abstract class DatabaseComponentTest extends TestCase {
fail(); fail();
} catch(NoSuchContactException expected) {} } catch(NoSuchContactException expected) {}
try {
db.getConnectionNumber(contactId, remoteIndex);
fail();
} catch(NoSuchContactException expected) {}
try { try {
db.getConnectionWindow(contactId, remoteIndex); db.getConnectionWindow(contactId, remoteIndex);
fail(); fail();
} catch(NoSuchContactException expected) {} } catch(NoSuchContactException expected) {}
try {
db.getRemoteIndex(contactId, transportId);
fail();
} catch(NoSuchContactException expected) {}
try { try {
db.getSharedSecret(contactId); db.getSharedSecret(contactId);
fail(); fail();
@@ -586,6 +598,11 @@ public abstract class DatabaseComponentTest extends TestCase {
fail(); fail();
} catch(NoSuchContactException expected) {} } catch(NoSuchContactException expected) {}
try {
db.removeContact(contactId);
fail();
} catch(NoSuchContactException expected) {}
try { try {
db.setConnectionWindow(contactId, remoteIndex, null); db.setConnectionWindow(contactId, remoteIndex, null);
fail(); fail();