416205 - Update nsDownloadManager::Init from changes to mozIStorageService::OpenDatabase

Status: RESOLVED FIXED

(Toolkit :: Downloads API, defect, P1)

Description

[Shawn Wilsher :sdwilsh]

See bug 416173

Comment 1

[Shawn Wilsher :sdwilsh]

Attachment: v1.0

Comment 2

[Ed Lee :Mardak]

Comment on attachment 301981 [details] [diff] [review]
v1.0

r=Mardak

>+    // delete and try again, since we don't care so much about losing a users
>+    // download history
Aww.. ;) Are we sure that the only situation we would have a "not ready" is if OpenDatabase would have returned NS_ERROR_FILE_CORRUPTED?

>-    rv = dbFile->Remove(PR_TRUE);
>+    rv = dbFile->Remove(PR_FALSE);
:)

>     NS_ENSURE_SUCCESS(rv, rv);
>     rv = storage->OpenDatabase(dbFile, getter_AddRefs(mDBConn));

>+    (void)mDBConn->GetConnectionReady(&ready);
>+    if (!ready) return NS_ERROR_UNEXPECTED;
nit: Your call if you want that on the same line. The only other places in nsDownloadManager that has same line if/return is for if (NS_FAILED(rv)) return rv; in CreateTable and GetTargetFile.

Comment 3

[Shawn Wilsher :sdwilsh]

Attachment: v1.1

(In reply to comment #2)
> Aww.. ;) Are we sure that the only situation we would have a "not ready" is if
> OpenDatabase would have returned NS_ERROR_FILE_CORRUPTED?
Yes, actually.

> nit: Your call if you want that on the same line. The only other places in
> nsDownloadManager that has same line if/return is for if (NS_FAILED(rv)) return
> rv; in CreateTable and GetTargetFile.
fair

Comment 4

[Shawn Wilsher :sdwilsh]

Checking in toolkit/components/downloads/src/nsDownloadManager.cpp;
new revision: 1.162; previous revision: 1.161

Comment 5

[Shawn Wilsher :sdwilsh]

This change was reverted - no longer needs to be in the testsuite