Bug 716576 - nsCacheService closes its databases too late. r=michal.novotny.

--HG--
extra : rebase_source : 7884a6e0aa247e7a5fff39863a2d29a8fbab7a8e

netwerk/cache/nsCacheService.cpp

@@ -1177,6 +1177,9 @@ nsCacheService::Shutdown()
         delete mDiskDevice;
         mDiskDevice = nsnull;
 
+        if (mOfflineDevice)
+            mOfflineDevice->Shutdown();
+
         NS_IF_RELEASE(mOfflineDevice);
 
 #ifdef PR_LOGGING

netwerk/cache/nsDiskCacheDeviceSQL.cpp

@@ -830,11 +830,6 @@ nsOfflineCacheDevice::nsOfflineCacheDevice()
 {
 }
 
-nsOfflineCacheDevice::~nsOfflineCacheDevice()
-{
-  Shutdown();
-}
-
 /* static */
 bool
 nsOfflineCacheDevice::GetStrictFileOriginPolicy()

netwerk/cache/nsDiskCacheDeviceSQL.h

@@ -102,8 +102,6 @@ public:
    * nsCacheDevice methods
    */
 
-  virtual ~nsOfflineCacheDevice();
-
   static nsOfflineCacheDevice *GetInstance();
 
   virtual nsresult        Init();