From 1ff588db0a54dc6e280af9115fbad2b614390b6b Mon Sep 17 00:00:00 2001 From: "dcamp@mozilla.com" Date: Tue, 26 Feb 2008 09:47:05 -0800 Subject: [PATCH] Bug 418752: don't bother fetching forwards on a failed safebrowsing update. r=tony, a=beltzner --- .../url-classifier/public/nsIUrlClassifierDBService.idl | 8 ++++++-- .../url-classifier/src/nsUrlClassifierDBService.cpp | 2 +- .../url-classifier/src/nsUrlClassifierStreamUpdater.cpp | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/toolkit/components/url-classifier/public/nsIUrlClassifierDBService.idl b/toolkit/components/url-classifier/public/nsIUrlClassifierDBService.idl index 97fbe7ce13c1..010fc03f3fec 100644 --- a/toolkit/components/url-classifier/public/nsIUrlClassifierDBService.idl +++ b/toolkit/components/url-classifier/public/nsIUrlClassifierDBService.idl @@ -69,8 +69,12 @@ interface nsIUrlClassifierUpdateObserver : nsISupports { */ void updateUrlRequested(in ACString url, in ACString table); - /* A stream update has completed */ - void streamFinished(); + /** + * A stream update has completed. + * + * @param status The state of the update process. + */ + void streamFinished(in nsresult status); /* The update has encountered an error and should be cancelled */ void updateError(in nsresult error); diff --git a/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp index 6346bb839fbb..7632d335789a 100644 --- a/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp +++ b/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp @@ -2536,7 +2536,7 @@ nsUrlClassifierDBServiceWorker::FinishStream() NS_ENSURE_STATE(mInStream); NS_ENSURE_STATE(mUpdateObserver); - mUpdateObserver->StreamFinished(); + mUpdateObserver->StreamFinished(mUpdateStatus); ResetStream(); diff --git a/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.cpp b/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.cpp index 4f4199d038ee..f686aaa02a47 100644 --- a/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.cpp +++ b/toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.cpp @@ -249,12 +249,12 @@ nsUrlClassifierStreamUpdater::UpdateUrlRequested(const nsACString &aUrl, } NS_IMETHODIMP -nsUrlClassifierStreamUpdater::StreamFinished() +nsUrlClassifierStreamUpdater::StreamFinished(nsresult status) { nsresult rv; // Pop off a pending URL and update it. - if (mPendingUpdates.Length() > 0) { + if (NS_SUCCEEDED(status) && mPendingUpdates.Length() > 0) { PendingUpdate &update = mPendingUpdates[0]; rv = FetchUpdate(update.mUrl, EmptyCString(), update.mTable); if (NS_FAILED(rv)) {