403767 - Remove unnecessary check on InitDB

Status: RESOLVED FIXED

(Core :: Networking: Cookies, defect)

Description

[Marco Bonardo [:mak]]

Attachment: Remove unnecessary check

nsCookieService::InitDB checks that all table columns are there using the following way:

// check if all the expected columns exist
nsCOMPtr<mozIStorageStatement> stmt;
rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
           "SELECT id, name, value, host, path, expiry, isSecure, isHttpOnly "
           "FROM moz_cookies"), getter_AddRefs(stmt));
if (NS_SUCCEEDED(rv)) {
    PRBool hasResult;
    rv = stmt->ExecuteStep(&hasResult);
}

if (NS_FAILED(rv)) {  

[omissis]

Since CreateStatement will already FAIL if columns are not there, the ExecuteStep is useless and it is also not resetted. 
The execute could be removed, the same method to check for columns sanity is already used into nsDownloadManager.cpp, with only the createstatement check.

if approved this will be checkin-needed

Comment 1

[[e-mail]]

Comment on attachment 288667 [details] [diff] [review]
Remove unnecessary check

nice catch; i tested this to make sure and you're right. (note that it's alright not to explicitly reset stmt here; the destructor will do that automatically when it goes out of scope.)

r=me, recommend you request sr=[e-mail], and i'll check it in for you. thanks for the patch!

Comment 2

[Marco Bonardo [:mak]]

Comment on attachment 288667 [details] [diff] [review]
Remove unnecessary check

requesting SR

Comment 3

[[e-mail]]

Comment on attachment 288667 [details] [diff] [review]
Remove unnecessary check

i checked in your patch while modifying that code as part of another bug (bug 403372). so, no need for additional reviews here.

Comment 4

[[e-mail]]

fixed - thanks!