Commit eec25e57 authored by Andreea Pavel's avatar Andreea Pavel
Browse files

Backed out changeset 1a7c349c2c60 (bug 1546892) for causing Bug 1528690 on a CLOSED TREE

parent 95a481ed

dom/indexedDB/ActorsParent.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -9500,7 +9500,7 @@ void DatabaseConnection::FinishWriteTransaction() { 
nsresult DatabaseConnection::StartSavepoint() {

nsresult DatabaseConnection::StartSavepoint() {

  AssertIsOnConnectionThread();

  AssertIsOnConnectionThread();

  MOZ_ASSERT(mStorageConnection);

  MOZ_ASSERT(mStorageConnection);

  MOZ_DIAGNOSTIC_ASSERT(mUpdateRefcountFunction);

  MOZ_ASSERT(mUpdateRefcountFunction);

  MOZ_ASSERT(mInWriteTransaction);

  MOZ_ASSERT(mInWriteTransaction);











  AUTO_PROFILER_LABEL("DatabaseConnection::StartSavepoint", DOM);




  AUTO_PROFILER_LABEL("DatabaseConnection::StartSavepoint", DOM);








@@ -10062,14 +10062,12 @@ nsresult DatabaseConnection::AutoSavepoint::Start(






  MOZ_ASSERT(connection);




  MOZ_ASSERT(connection);








  connection->AssertIsOnConnectionThread();




  connection->AssertIsOnConnectionThread();


















#ifndef NIGHTLY_BUILD










  // This is just a quick fix for preventing accessing the nullptr. The cause is




  // This is just a quick fix for preventing accessing the nullptr. The cause is








  // probably because the connection was unexpectedly closed.




  // probably because the connection was unexpectedly closed.








  if (!connection->GetUpdateRefcountFunction()) {




  if (!connection->GetUpdateRefcountFunction()) {








    NS_WARNING("The connection was closed for some reasons!");




    NS_WARNING("The connection was closed for some reasons!");








    return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;




    return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;








  }




  }








#endif




















  MOZ_ASSERT(!mConnection);




  MOZ_ASSERT(!mConnection);








  MOZ_ASSERT(!mDEBUGTransaction);




  MOZ_ASSERT(!mDEBUGTransaction);