Index: sync/engine/syncer.cc |
=================================================================== |
--- sync/engine/syncer.cc (revision 164641) |
+++ sync/engine/syncer.cc (working copy) |
@@ -83,7 +83,7 @@ |
early_exit_requested_ = true; |
} |
-bool Syncer::SyncShare(sessions::SyncSession* session, |
+void Syncer::SyncShare(sessions::SyncSession* session, |
SyncerStep first_step, |
SyncerStep last_step) { |
ScopedSessionContextConflictResolver scoped(session->context(), |
@@ -179,16 +179,17 @@ |
} |
default: |
LOG(ERROR) << "Unknown command: " << current_step; |
- } // switch |
+ } |
DVLOG(2) << "last step: " << SyncerStepToString(last_step) << ", " |
<< "current step: " << SyncerStepToString(current_step) << ", " |
<< "next step: " << SyncerStepToString(next_step) << ", " |
<< "snapshot: " << session->TakeSnapshot().ToString(); |
- if (last_step == current_step) |
- return true; |
+ if (last_step == current_step) { |
+ session->SetFinished(); |
+ break; |
+ } |
current_step = next_step; |
- } // while |
- return false; |
+ } |
} |
void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest) { |