Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1194319 - Correctly deal with all possible ways that initializing the permission manager DB connection can fail; r=mystor

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-08-18 15:37:12 -04:00
parent ef2bd61403
commit 10a0e4dd34
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/cookie/nsPermissionManager.cpp
View File

@ -846,9 +846,7 @@ nsPermissionManager::InitDB(bool aRemoveFile)
}
rv = OpenDatabase(permissionsFile);
if (rv == NS_ERROR_UNEXPECTED) {
return rv;
} else if (rv == NS_ERROR_FILE_CORRUPTED) {
if (rv == NS_ERROR_FILE_CORRUPTED) {
LogToConsole(NS_LITERAL_STRING("permissions.sqlite is corrupted! Try again!"));
// Add telemetry probe
@ -862,6 +860,8 @@ nsPermissionManager::InitDB(bool aRemoveFile)
rv = OpenDatabase(permissionsFile);
NS_ENSURE_SUCCESS(rv, rv);
LogToConsole(NS_LITERAL_STRING("OpenDatabase to permissions.sqlite is successful!"));
} else if (NS_FAILED(rv)) {
return rv;
}
bool ready;