Bug 1140808 - Shut down the active entries table when the cache service is shut down. r=michal
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 17 Mar 2015 10:55:00 +0100
changeset 234217 54ab128ef1c058596198766ab4373c4d1a73432e
parent 234216 8d51dbc085b58f46c2a77dccc1682c58f39cc25f
child 234218 f3d7d48771f95aacc10bab18653970f45b08cf84
push id57073
push usercbook@mozilla.com
push dateWed, 18 Mar 2015 11:00:37 +0000
treeherdermozilla-inbound@b976b2dc1a26 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmichal
bugs1140808
milestone39.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 1140808 - Shut down the active entries table when the cache service is shut down. r=michal
netwerk/cache/nsCacheService.cpp
--- a/netwerk/cache/nsCacheService.cpp
+++ b/netwerk/cache/nsCacheService.cpp
@@ -1227,16 +1227,17 @@ nsCacheService::Shutdown()
         if (mSmartSizeTimer) {
             mSmartSizeTimer->Cancel();
             mSmartSizeTimer = nullptr;
         }
 
         // Make sure to wait for any pending cache-operations before
         // proceeding with destructive actions (bug #620660)
         (void) SyncWithCacheIOThread();
+        mActiveEntries.Shutdown();
 
         // obtain the disk cache directory in case we need to sanitize it
         parentDir = mObserver->DiskCacheParentDirectory();
         shouldSanitize = mObserver->SanitizeAtShutdown();
 
         // deallocate memory and disk caches
         delete mMemoryDevice;
         mMemoryDevice = nullptr;