[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [baloo] src/engine: Transaction not created => don't try to abort them
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2016-09-11 19:13:35
Message-ID: E1bjAC7-00088j-EX () code ! kde ! org
[Download RAW message or body]

Git commit 54f7363048c7db41f63c85f637911a5598c30e9e by Christoph Cullmann.
Committed on 11/09/2016 at 19:10.
Pushed by cullmann into branch 'master'.

Transaction not created => don't try to abort them

REVIEW: 128891

M  +0    -2    src/engine/database.cpp

http://commits.kde.org/baloo/54f7363048c7db41f63c85f637911a5598c30e9e

diff --git a/src/engine/database.cpp b/src/engine/database.cpp
index 6a433c7..37b8e97 100644
--- a/src/engine/database.cpp
+++ b/src/engine/database.cpp
@@ -139,7 +139,6 @@ bool Database::open(OpenMode mode)
         int rc = mdb_txn_begin(m_env, NULL, MDB_RDONLY, &txn);
         Q_ASSERT_X(rc == 0, "Database::transaction ro begin", mdb_strerror(rc));
         if (rc) {
-            mdb_txn_abort(txn);
             mdb_env_close(m_env);
             m_env = nullptr;
             return false;
@@ -182,7 +181,6 @@ bool Database::open(OpenMode mode)
         int rc = mdb_txn_begin(m_env, NULL, 0, &txn);
         Q_ASSERT_X(rc == 0, "Database::transaction begin", mdb_strerror(rc));
         if (rc) {
-            mdb_txn_abort(txn);
             mdb_env_close(m_env);
             m_env = nullptr;
             return false;
[prev in list] [next in list] [prev in thread] [next in thread]