зеркало из https://github.com/mozilla/gecko-dev.git
Fix for 149759. Commit the db changes in ConvertLDIFtoMAB() only if 'db' is not null. r=naving, sr=bienvenu.
This commit is contained in:
Родитель
1cbd19d782
Коммит
71e8996419
|
@ -1282,8 +1282,10 @@ NS_IMETHODIMP nsAddressBook::ConvertLDIFtoMAB(nsIFileSpec *fileSpec, PRBool migr
|
||||||
|
|
||||||
fileSpec->CloseStream();
|
fileSpec->CloseStream();
|
||||||
|
|
||||||
// Commit the changes.
|
// Commit the changes if 'db' is set.
|
||||||
return(db->Commit(nsAddrDBCommitType::kLargeCommit));
|
if (db)
|
||||||
|
rv = db->Commit(nsAddrDBCommitType::kLargeCommit);
|
||||||
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define CSV_DELIM ","
|
#define CSV_DELIM ","
|
||||||
|
|
Загрузка…
Ссылка в новой задаче