| Index: third_party/cacheinvalidation/src/google/cacheinvalidation/impl/recurring-task.cc
|
| diff --git a/third_party/cacheinvalidation/src/google/cacheinvalidation/impl/recurring-task.cc b/third_party/cacheinvalidation/src/google/cacheinvalidation/impl/recurring-task.cc
|
| index 3196c8fa9dbd5b15c3e9a38b190ec6f9c714784c..75869f494f0556e2ec71e01bfc9811b7de4cc65c 100644
|
| --- a/third_party/cacheinvalidation/src/google/cacheinvalidation/impl/recurring-task.cc
|
| +++ b/third_party/cacheinvalidation/src/google/cacheinvalidation/impl/recurring-task.cc
|
| @@ -59,7 +59,8 @@ void RecurringTask::EnsureScheduled(bool is_retry, string debug_reason) {
|
| }
|
|
|
| void RecurringTask::RunTaskAndRescheduleIfNeeded() {
|
| - CHECK(scheduler_->IsRunningOnThread()) << "Not on scheduler thread";
|
| + // Not on scheduler thread
|
| + CHECK(scheduler_->IsRunningOnThread());
|
| is_scheduled_ = false;
|
|
|
| // Run the task. If the task asks for a retry, reschedule it after at a
|
| @@ -67,9 +68,9 @@ void RecurringTask::RunTaskAndRescheduleIfNeeded() {
|
| if (RunTask()) {
|
| // The task asked to be rescheduled, so reschedule it after a timeout has
|
| // occurred.
|
| + // Spinning: No exp back off and initial delay is zero
|
| CHECK((delay_generator_ != NULL) ||
|
| - (initial_delay_ > Scheduler::NoDelay()))
|
| - << "Spinning: No exp back off and initial delay is zero";
|
| + (initial_delay_ > Scheduler::NoDelay()));
|
| EnsureScheduled(true, "Retry");
|
| } else if (delay_generator_ != NULL) {
|
| // The task asked not to be rescheduled. Treat it as having "succeeded"
|
|
|