Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1256049: Correctly handle databases currently performing maintenance when a new transaction is started. r=janv

Browse Source
This commit is contained in:
Kyle Huey 2016-04-05 20:21:25 -07:00
parent f035a6ffcf
commit 5063425777
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/indexedDB/ActorsParent.cpp
View File

@ -11550,7 +11550,9 @@ ConnectionPool::Start(const nsID& aBackgroundChildLoggingId,
/* aFromQueuedTransactions */ false);
}
if (!databaseInfoIsNew && mIdleDatabases.RemoveElement(dbInfo)) {
if (!databaseInfoIsNew &&
(mIdleDatabases.RemoveElement(dbInfo) ||
mDatabasesPerformingIdleMaintenance.RemoveElement(dbInfo))) {
AdjustIdleTimer();
}
@ -12417,7 +12419,7 @@ IdleConnectionRunnable::Run()
RefPtr<ConnectionPool> connectionPool = mDatabaseInfo->mConnectionPool;
MOZ_ASSERT(connectionPool);
if (mDatabaseInfo->mClosing) {
if (mDatabaseInfo->mClosing || mDatabaseInfo->TotalTransactionCount()) {
MOZ_ASSERT(!connectionPool->
mDatabasesPerformingIdleMaintenance.Contains(mDatabaseInfo));
} else {
@ -12425,9 +12427,7 @@ IdleConnectionRunnable::Run()
connectionPool->
mDatabasesPerformingIdleMaintenance.RemoveElement(mDatabaseInfo));
if (!mDatabaseInfo->TotalTransactionCount()) {
connectionPool->NoteIdleDatabase(mDatabaseInfo);
}
connectionPool->NoteIdleDatabase(mDatabaseInfo);
}
return NS_OK;