Ensure we don't accidentally spawn more transactions than necessary.

1 files changed, 7 insertions, 0 deletions

diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp
index 6c341e2..51e5da7 100644
--- a/common/storage/entitystore.cpp
+++ b/common/storage/entitystore.cpp
@@ -111,6 +111,7 @@ EntityStore::EntityStore(const ResourceContext &context, const Log::Context &ctx
 void EntityStore::startTransaction(Sink::Storage::DataStore::AccessMode accessMode)
 {
     SinkTraceCtx(d->logCtx) << "Starting transaction: " << accessMode;
+    Q_ASSERT(!d->transaction);
     Sink::Storage::DataStore store(Sink::storageLocation(), d->resourceContext.instanceId(), accessMode);
     d->transaction = store.createTransaction(accessMode);
     Q_ASSERT(d->transaction.validateNamedDatabases());
@@ -119,6 +120,7 @@ void EntityStore::startTransaction(Sink::Storage::DataStore::AccessMode accessMo
 void EntityStore::commitTransaction()
 {
     SinkTraceCtx(d->logCtx) << "Committing transaction";
+    Q_ASSERT(d->transaction);
     d->transaction.commit();
     d->transaction = Storage::DataStore::Transaction();
 }
@@ -130,6 +132,11 @@ void EntityStore::abortTransaction()
     d->transaction = Storage::DataStore::Transaction();
 }
 
+bool EntityStore::hasTransaction() const
+{
+    return d->transaction;
+}
+
 void EntityStore::copyBlobs(ApplicationDomain::ApplicationDomainType &entity, qint64 newRevision)
 {
     const auto directory = d->entityBlobStoragePath(entity.identifier());