From b667b55f563fc8ab2d37e226fffd94642d998ca7 Mon Sep 17 00:00:00 2001
From: "varga%netscape.com"
 <varga%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 18 Apr 2003 17:54:44 +0000
Subject: [PATCH] Fix for bug 202477. Closing any browser window causes loooong
 hang (@ nsBookmarksService::WriteBookmarks). r=darin, sr=smfr, patch by
 bsmedberg

git-svn-id: svn://10.0.0.236/trunk@141398 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../bookmarks/src/nsBookmarksService.cpp         | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
index 22864f2dddd..c17a68ec5a9 100644
--- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
+++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
@@ -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))
     {