sync/internal_api/sync_rollback_manager.cc - Issue 363543002: Properly handle initialization failure and following manager shutdown without

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/internal_api/sync_rollback_manager.cc

Issue 363543002: Properly handle initialization failure and following manager shutdown without (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« sync/internal_api/sync_backup_manager_unittest.cc ('K') | « sync/internal_api/sync_backup_manager_unittest.cc ('k') | sync/internal_api/sync_rollback_manager_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/internal_api/sync_rollback_manager.cc

diff --git a/sync/internal_api/sync_rollback_manager.cc b/sync/internal_api/sync_rollback_manager.cc

index 84367b082b05de7e085b09c50c696c68d4935966..967e1ecc76577f65129d710762dc5f83cec6589a 100644

--- a/sync/internal_api/sync_rollback_manager.cc

+++ b/sync/internal_api/sync_rollback_manager.cc

@@ -53,16 +53,18 @@ void SyncRollbackManager::Init(

report_unrecoverable_error_function,

cancelation_signal);

- change_delegate_ = change_delegate;

+ if (initialized()) {

+ change_delegate_ = change_delegate;

- for (size_t i = 0; i < workers.size(); ++i) {

- ModelSafeGroup group = workers[i]->GetModelSafeGroup();

- CHECK(workers_.find(group) == workers_.end());

- workers_[group] = workers[i];

- }

+ for (size_t i = 0; i < workers.size(); ++i) {

+ ModelSafeGroup group = workers[i]->GetModelSafeGroup();

+ CHECK(workers_.find(group) == workers_.end());

+ workers_[group] = workers[i];

+ }

- rollback_ready_types_ = GetUserShare()->directory->InitialSyncEndedTypes();

- rollback_ready_types_.RetainAll(BackupTypes());

+ rollback_ready_types_ = GetUserShare()->directory->InitialSyncEndedTypes();

+ rollback_ready_types_.RetainAll(BackupTypes());

+ }

}

void SyncRollbackManager::StartSyncingNormally(