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

Don't throw a DbException if a contact sends duplicate batches.

Browse Source
This commit is contained in:
akwizgran
2011-08-01 17:56:18 +01:00
parent 8e8c83b83c
commit 0d0885bf4b
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/net/sf/briar/db/JdbcDatabase.java
View File

@@ -383,8 +383,24 @@ abstract class JdbcDatabase implements Database<Connection> {
public void addBatchToAck(Connection txn, ContactId c, BatchId b)
throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
String sql = "INSERT INTO batchesToAck (batchId, contactId)"
String sql = "SELECT COUNT(batchId) FROM batchesToAck"
+ " WHERE batchId = ? AND contactId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, b.getBytes());
ps.setInt(2, c.getInt());
rs = ps.executeQuery();
boolean found = rs.next();
assert found;
int count = rs.getInt(1);
assert count <= 1;
boolean more = rs.next();
assert !more;
rs.close();
ps.close();
if(count == 1) return;
sql = "INSERT INTO batchesToAck (batchId, contactId)"
+ " VALUES (?, ?)";
ps = txn.prepareStatement(sql);
ps.setBytes(1, b.getBytes());
@@ -393,6 +409,7 @@ abstract class JdbcDatabase implements Database<Connection> {
assert rowsAffected == 1;
ps.close();
} catch(SQLException e) {
tryToClose(rs);
tryToClose(ps);
tryToClose(txn);
throw new DbException(e);
@@ -1249,7 +1266,8 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.setInt(5, 1);
rs = ps.executeQuery();
boolean found = rs.next();
assert !rs.next();
boolean more = rs.next();
assert !more;
rs.close();
ps.close();
return found;

27
test/net/sf/briar/db/H2DatabaseTest.java
View File

@@ -404,6 +404,33 @@ public class H2DatabaseTest extends TestCase {
db.close();
}
@Test
public void testDuplicateBatchesReceived() throws DbException {
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
// Add a contact and receive the same batch twice
assertEquals(contactId, db.addContact(txn, null));
db.addBatchToAck(txn, contactId, batchId);
db.addBatchToAck(txn, contactId, batchId);
db.commitTransaction(txn);
// The batch ID should only be returned once
Collection<BatchId> acks = db.getBatchesToAck(txn, contactId);
assertEquals(1, acks.size());
assertTrue(acks.contains(batchId));
// Remove the batch ID
db.removeBatchesToAck(txn, contactId, acks);
// The batch ID should have been removed
acks = db.getBatchesToAck(txn, contactId);
assertEquals(0, acks.size());
db.commitTransaction(txn);
db.close();
}
@Test
public void testRemoveAckedBatch() throws DbException {
Database<Connection> db = open(false);