summaryrefslogtreecommitdiffstats
path: root/chrome/browser/character_encoding.cc
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 23:27:53 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 23:27:53 +0000
commit16dbe4e7d88913eeb4574e9b6a8222d7e76c8981 (patch)
tree0e3a433004010a1bd341575451a80d7ffeb38146 /chrome/browser/character_encoding.cc
parenta036232dfd4ae7b50ee97e69dbfa9ebb8f913f68 (diff)
downloadchromium_src-16dbe4e7d88913eeb4574e9b6a8222d7e76c8981.zip
chromium_src-16dbe4e7d88913eeb4574e9b6a8222d7e76c8981.tar.gz
chromium_src-16dbe4e7d88913eeb4574e9b6a8222d7e76c8981.tar.bz2
sync: Retry soon when server returns conflict
When the server gives us a conflict response, we ought to fetch updates in order to figure out what the server is complaining about, resolve any conflicts locally, then re-commit. The current syncer, although not intentionally built to handle this scenario, does the right thing. It considers the server's return code to be indicative of a transient error, so it backs off then retries later. The retry sync cycle will fetch updates, resolve conflicts, and recommit, which is exactly what we want. Unfortunately, the backoff can take five minutes. This commit reduces the time spent unnecessarily backing off. It's not the cleanest solution, but its implementation is easy and safe. BUG=157955 Review URL: https://chromiumcodereview.appspot.com/11411041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/character_encoding.cc')
0 files changed, 0 insertions, 0 deletions