chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc - Issue 8298016: Making some CHECK statements to NOTREACHED.

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: chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

Issue 8298016: Making some CHECK statements to NOTREACHED. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: For review. Created 9 years, 2 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

« no previous file with comments | « no previous file | chrome/browser/sync/engine/process_commit_response_command.cc » ('j') | chrome/browser/sync/engine/process_commit_response_command.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

index a480874a206ee1d090a0719ecd1fc25a8bc80115..cd7da87ce107d75f18b28cb1cf81e7f0c1b1eb07 100644

--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

@@ -116,7 +116,9 @@ bool RollbackEntry(syncable::WriteTransaction* trans,

entry.Put(syncable::PARENT_ID, backup->ref(syncable::PARENT_ID));

if (!backup->ref(syncable::IS_DEL)) {

- CHECK(entry.PutPredecessor(backup->ref(syncable::PREV_ID)));

+ if (!entry.PutPredecessor(backup->ref(syncable::PREV_ID))) {

akalin 2011/10/15 01:19:44 add TODO to propagate error up, refer to a bug

+ NOTREACHED();

+ }

}

if (backup->ref(syncable::PREV_ID) != entry.Get(syncable::PREV_ID))