Bug 758688 - Thunderbird Bloat & Mozmill tests - Assertion failure: !connections[i]->ConnectionReady(), mozStorageService.cpp:852. r=florian. a=mbanner.

CLOSED TREE.

chat/components/src/imContacts.js

@@ -121,8 +121,17 @@ this.__defineGetter__("DBConn", function() {
   if (gDBConnWithPendingTransaction)
     return gDBConnWithPendingTransaction;
 
-  if (!gDBConnection)
+  if (!gDBConnection) {
     gDBConnection = getDBConnection();
+    function dbClose(aSubject, aTopic, aData) {
+      Services.obs.removeObserver(dbClose, aTopic);
+      if (gDBConnection) {
+        gDBConnection.asyncClose();
+        gDBConnection = null;
+      }
+    }
+    Services.obs.addObserver(dbClose, "profile-before-change", false);
+  }
   gDBConnWithPendingTransaction = gDBConnection;
   gDBConnection.beginTransaction();
   executeSoon(function() {