diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 23:54:41 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 23:54:41 +0000 |
| commit | 5763cc5e32235e4fb8171edbbc017716850de17c (patch) | |
| tree | 2c5cd159801268796b43d143d60ecba9b027c943 /chrome/browser/sync | |
| parent | 995403c8020b1dc23e57e4ebad8d4f5eb937e40e (diff) | |
| download | chromium_src-5763cc5e32235e4fb8171edbbc017716850de17c.zip chromium_src-5763cc5e32235e4fb8171edbbc017716850de17c.tar.gz chromium_src-5763cc5e32235e4fb8171edbbc017716850de17c.tar.bz2 | |
When applying updates, the UpdateApplicator should check ServerModelType and not
the local version, as it may not have been set yet. I messed this up as part of my multi-pass syncer command change yesterday.
BUG=36822
Review URL: http://codereview.chromium.org/661133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rwxr-xr-x | chrome/browser/sync/engine/update_applicator.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/update_applicator.cc b/chrome/browser/sync/engine/update_applicator.cc index 9f2598c..268de4c 100755 --- a/chrome/browser/sync/engine/update_applicator.cc +++ b/chrome/browser/sync/engine/update_applicator.cc @@ -85,7 +85,8 @@ void UpdateApplicator::Advance() { } bool UpdateApplicator::SkipUpdate(const syncable::MutableEntry& entry) { - ModelSafeGroup g = GetGroupForModelType(entry.GetModelType(), routing_info_); + ModelSafeGroup g = + GetGroupForModelType(entry.GetServerModelType(), routing_info_); if (g != group_filter_) return true; return false; |