Bug 1256049: More assertions. r=janv
☠☠ backed out by 76134d6ad636 ☠ ☠
authorKyle Huey <khuey@kylehuey.com>
Mon, 04 Apr 2016 13:29:59 -0700
changeset 291539 7f0ea82bf6e9ef8523219245030071f6e37bf302
parent 291538 73b3beeddb7bb7727a8b28eeb387a5c3dc70558a
child 291540 b45ffb5760bc3f6ccba73a2777a4f86ccff75b24
push id74609
push userkhuey@mozilla.com
push dateMon, 04 Apr 2016 20:30:33 +0000
treeherdermozilla-inbound@7f0ea82bf6e9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjanv
bugs1256049
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1256049: More assertions. r=janv
dom/indexedDB/ActorsParent.cpp
--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -11545,18 +11545,22 @@ ConnectionPool::Start(const nsID& aBackg
     }
   }
 
   if (!transactionInfo->mBlockedOn.Count()) {
     Unused << ScheduleTransaction(transactionInfo,
                                   /* aFromQueuedTransactions */ false);
   }
 
-  if (!databaseInfoIsNew && mIdleDatabases.RemoveElement(dbInfo)) {
-    AdjustIdleTimer();
+  if (!databaseInfoIsNew) {
+    MOZ_RELEASE_ASSERT(!mDatabasesPerformingIdleMaintenance.Contains(dbInfo));
+
+    if (mIdleDatabases.RemoveElement(dbInfo)) {
+      AdjustIdleTimer();
+    }
   }
 
   return transactionId;
 }
 
 void
 ConnectionPool::Dispatch(uint64_t aTransactionId, nsIRunnable* aRunnable)
 {