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

Replace transaction.setComplete() by database.commitTransaction()

Browse Source
This commit is contained in:
Torsten Grote
2016-10-31 08:47:11 -02:00
parent 36f087c512
commit b34b4623ed
39 changed files with 259 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-core/src/org/briarproject/messaging/ConversationManagerImpl.java
View File

@@ -46,7 +46,7 @@ class ConversationManagerImpl implements ConversationManager {
Transaction txn = db.startTransaction(true);
try {
contact = db.getContact(txn, contactId);
txn.setComplete();
db.commitTransaction(txn);
} finally {
db.endTransaction(txn);
}
@@ -70,7 +70,7 @@ class ConversationManagerImpl implements ConversationManager {
if (count.getLatestMsgTime() > latestTime)
latestTime = count.getLatestMsgTime();
}
txn.setComplete();
db.commitTransaction(txn);
} finally {
db.endTransaction(txn);
}

6
briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java
View File

@@ -122,7 +122,7 @@ class MessagingManagerImpl extends ConversationClientImpl
meta.put("read", true);
clientHelper.addLocalMessage(txn, m.getMessage(), meta, true);
trackOutgoingMessage(txn, m.getMessage());
txn.setComplete();
db.commitTransaction(txn);
} catch (FormatException e) {
throw new RuntimeException(e);
} finally {
@@ -157,7 +157,7 @@ class MessagingManagerImpl extends ConversationClientImpl
Transaction txn = db.startTransaction(true);
try {
contact = db.getContact(txn, c);
txn.setComplete();
db.commitTransaction(txn);
} finally {
db.endTransaction(txn);
}
@@ -175,7 +175,7 @@ class MessagingManagerImpl extends ConversationClientImpl
g = getContactGroup(db.getContact(txn, c)).getId();
metadata = clientHelper.getMessageMetadataAsDictionary(txn, g);
statuses = db.getMessageStatus(txn, c, g);
txn.setComplete();
db.commitTransaction(txn);
} catch (FormatException e) {
throw new DbException(e);
} finally {