[tracker/journal-err-reporting] squash
- From: Philip Van Hoof <pvanhoof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/journal-err-reporting] squash
- Date: Tue, 26 Apr 2011 16:07:10 +0000 (UTC)
commit 379147b06c1249b59d7a95b96c6dd818c7980209
Author: Philip Van Hoof <philip codeminded be>
Date: Tue Apr 26 18:06:51 2011 +0200
squash
src/libtracker-data/tracker-db-journal.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/libtracker-data/tracker-db-journal.c b/src/libtracker-data/tracker-db-journal.c
index d57bbbb..47df389 100644
--- a/src/libtracker-data/tracker-db-journal.c
+++ b/src/libtracker-data/tracker-db-journal.c
@@ -1202,6 +1202,7 @@ tracker_db_journal_commit_db_transaction (GError **error)
if (current_transaction_format == TRANSACTION_FORMAT_ONTOLOGY) {
ret = db_journal_writer_commit_db_transaction (&ontology_writer, &n_error);
+ /* Coalesces the two error reports: */
db_journal_writer_shutdown (&ontology_writer, n_error ? NULL : &n_error);
} else {
ret = db_journal_writer_commit_db_transaction (&writer, &n_error);
@@ -1215,7 +1216,6 @@ tracker_db_journal_commit_db_transaction (GError **error)
#endif /* GLib check */
}
- /* Coalesces the two error reports: */
if (n_error) {
g_propagate_error (error, n_error);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]