Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

100326 r=bienvenu sr=sspitzer Abort the compaction if writing to folder fails.

Browse Source 
90702 r=bienvenu sr=sspitzer Update the expungedBytes for offline stores after compaction
95584 r/sr=bienvenu CleanupTempFiles in case compaction on a folder cannot start because
some other operation is in progress.
This commit is contained in:
naving%netscape.com 2001-09-21 01:40:30 +00:00
parent 87c16bccb7
commit e5d99da8ae
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mailnews/base/src/nsMsgFolderCompactor.cpp
View File

@ -303,7 +303,10 @@ NS_IMETHODIMP nsFolderCompactState::StartCompacting()
if (m_compactAll)
CompactNextFolder();
else
{
CleanupTempFilesAfterError();
return rv;
}
}
if (m_size > 0)
{
@ -481,6 +484,7 @@ nsFolderCompactState::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
// because the compact did not successfully complete.
if (NS_SUCCEEDED(status))
{
m_folder->NotifyCompactCompleted();
CleanupTempFilesAfterError();
ReleaseFolderLock();
Release();
@ -491,6 +495,7 @@ done:
if (NS_FAILED(rv)) {
m_status = rv; // set the status to rv so the destructor can remove the
// temp folder and database
m_folder->NotifyCompactCompleted();
ReleaseFolderLock();
Release(); // kill self
return rv;
@ -518,6 +523,8 @@ nsFolderCompactState::OnDataAvailable(nsIRequest *request, nsISupports *ctxt,
count -= readCount;
NS_ASSERTION (writeCount == readCount,
"Oops, write fail, folder can be corrupted!\n");
if (writeCount != readCount)
return NS_MSG_ERROR_WRITING_MAIL_FOLDER;
}
}
return rv;
@ -630,6 +637,11 @@ nsOfflineStoreCompactState::FinishCompact()
m_fileStream = nsnull;
// make sure the new database is valid
nsCOMPtr <nsIDBFolderInfo> dbFolderInfo;
m_db->GetDBFolderInfo(getter_AddRefs(dbFolderInfo));
if (dbFolderInfo)
dbFolderInfo->SetExpungedBytes(0);
m_folder->UpdateSummaryTotals(PR_TRUE);
m_db->SetSummaryValid(PR_TRUE);
m_db->Commit(nsMsgDBCommitType::kLargeCommit);