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

Fix for bug 202477. Closing any browser window causes loooong hang (@ nsBookmarksService::WriteBookmarks).

Browse Source 
r=darin, sr=smfr, patch by bsmedberg


git-svn-id: svn://10.0.0.236/trunk@141398 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
varga%netscape.com 2003-04-18 17:54:44 +00:00
parent 3a67641b69
commit b667b55f56
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
View File

@ -4875,15 +4875,24 @@ nsBookmarksService::WriteBookmarks(nsIFile* aBookmarksFile,
rv = tempFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, /*octal*/ 0600);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIFileOutputStream> strm =
do_CreateInstance(NS_LOCALFILEOUTPUTSTREAM_CONTRACTID, &rv);
nsCOMPtr<nsIOutputStream> out;
rv = NS_NewLocalFileOutputStream(getter_AddRefs(out),
tempFile,
PR_WRONLY,
/*octal*/ 0600,
0);
if (NS_FAILED(rv))
{
tempFile->Remove(PR_FALSE);
return rv;
}
rv = strm->Init(tempFile, PR_WRONLY, /*octal*/ 0600, 0);
// We need a buffered output stream for performance.
// See bug 202477.
nsCOMPtr<nsIOutputStream> strm;
rv = NS_NewBufferedOutputStream(getter_AddRefs(strm),
out,
4096);
if (NS_FAILED(rv))
{
tempFile->Remove(PR_FALSE);
@ -4897,6 +4906,7 @@ nsBookmarksService::WriteBookmarks(nsIFile* aBookmarksFile,
rv |= WriteBookmarksContainer(aDataSource, strm, aRoot, 0, parentArray);
strm->Close();
out->Close();
if (NS_FAILED(rv))
{