Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 384810 - DM should restore the database state gracefully after a crash. r=sdwilsh, a=mconnor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@237372 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edward.lee%engineering.uiuc.edu 2007-10-07 16:15:32 +00:00
parent 5d1c651744
commit 68ee91d91b
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp
View File

@ -592,6 +592,9 @@ nsDownloadManager::RestoreDatabaseState()
rv = stmt->BindInt32Parameter(i++, nsIDownloadManager::DOWNLOAD_DOWNLOADING);
NS_ENSURE_SUCCESS(rv, rv);
rv = stmt->Execute();
NS_ENSURE_SUCCESS(rv, rv);
// Finally, let's retry all of those downloads
for (nsTArray<PRUint32>::size_type i = 0; i < ids.Length(); i++)
(void)RetryDownload(ids[i]);
@ -697,12 +700,6 @@ nsDownloadManager::Init()
if (doImport)
ImportDownloadHistory();
rv = RestoreDatabaseState();
NS_ENSURE_SUCCESS(rv, rv);
rv = RestoreActiveDownloads();
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundleService> bundleService =
do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
@ -729,6 +726,14 @@ nsDownloadManager::Init()
"WHERE id = ?8"), getter_AddRefs(mUpdateDownloadStatement));
NS_ENSURE_SUCCESS(rv, rv);
// Do things *after* initializing various download manager properties such as
// restoring downloads to a consistent state
rv = RestoreDatabaseState();
NS_ENSURE_SUCCESS(rv, rv);
rv = RestoreActiveDownloads();
NS_ENSURE_SUCCESS(rv, rv);
// The following three AddObserver calls must be the last lines in this function,
// because otherwise, this function may fail (and thus, this object would be not
// completely initialized), but the observerservice would still keep a reference
@ -738,7 +743,6 @@ nsDownloadManager::Init()
// These observers will be cleaned up automatically at app shutdown. We do
// not bother explicitly breaking the observers because we are a singleton
// that lives for the duration of the app.
//
mObserverService->AddObserver(this, "quit-application", PR_FALSE);
mObserverService->AddObserver(this, "quit-application-requested", PR_FALSE);
mObserverService->AddObserver(this, "offline-requested", PR_FALSE);

5
mozilla/toolkit/components/downloads/src/nsDownloadManager.h
View File

@ -99,6 +99,11 @@ protected:
nsresult InitDB(PRBool *aDoImport);
nsresult CreateTable();
nsresult ImportDownloadHistory();
/**
* Fix up the database after a crash such as dealing with previously-active
* downloads.
*/
nsresult RestoreDatabaseState();
/**