From eec25e57b2c7ac0a1b3f22d4c683b01220578e8c Mon Sep 17 00:00:00 2001 From: Andreea Pavel Date: Wed, 8 May 2019 20:50:48 +0300 Subject: [PATCH] Backed out changeset 1a7c349c2c60 (bug 1546892) for causing Bug 1528690 on a CLOSED TREE --- dom/indexedDB/ActorsParent.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp index bace4cfb3b76..e52c3848ea1b 100644 --- a/dom/indexedDB/ActorsParent.cpp +++ b/dom/indexedDB/ActorsParent.cpp @@ -9500,7 +9500,7 @@ void DatabaseConnection::FinishWriteTransaction() { nsresult DatabaseConnection::StartSavepoint() { AssertIsOnConnectionThread(); MOZ_ASSERT(mStorageConnection); - MOZ_DIAGNOSTIC_ASSERT(mUpdateRefcountFunction); + MOZ_ASSERT(mUpdateRefcountFunction); MOZ_ASSERT(mInWriteTransaction); AUTO_PROFILER_LABEL("DatabaseConnection::StartSavepoint", DOM); @@ -10062,14 +10062,12 @@ nsresult DatabaseConnection::AutoSavepoint::Start( MOZ_ASSERT(connection); connection->AssertIsOnConnectionThread(); -#ifndef NIGHTLY_BUILD // This is just a quick fix for preventing accessing the nullptr. The cause is // probably because the connection was unexpectedly closed. if (!connection->GetUpdateRefcountFunction()) { NS_WARNING("The connection was closed for some reasons!"); return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR; } -#endif MOZ_ASSERT(!mConnection); MOZ_ASSERT(!mDEBUGTransaction);