Bug 661972 - don't call Service.sync() with ancient fullSync param. r=philiKON
authorRichard Newman <rnewman@mozilla.com>
Mon, 06 Jun 2011 07:49:13 -0700
changeset 70565 615040e391dee59f58e35847c0731513e2e0d1a2
parent 70564 e4da046972684de715792a5bc2ed59085a33e965
child 70566 b0e0455d510273b88dfa6bc1eec2f52cd8e118af
push id106
push userrnewman@mozilla.com
push dateMon, 06 Jun 2011 14:49:40 +0000
treeherderservices-central@615040e391de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphiliKON
bugs661972
milestone7.0a1
Bug 661972 - don't call Service.sync() with ancient fullSync param. r=philiKON
services/sync/modules/service.js
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -586,17 +586,17 @@ WeaveSvc.prototype = {
         break;
       case "weave:resource:status:401":
         this._handleResource401(subject);
         break;
       case "idle":
         this._log.trace("Idle time hit, trying to sync");
         Svc.Idle.removeIdleObserver(this, this._idleTime);
         this._idleTime = 0;
-        Utils.delay(function() this.sync(false), 0, this);
+        Utils.delay(function() this.sync(), 0, this);
         break;
       case "nsPref:changed":
         if (this._ignorePrefObserver)
           return;
         let engine = data.slice((PREFS_BRANCH + "engine.").length);
         this._handleEngineStatusChanged(engine);
         break;
     }
@@ -1040,17 +1040,17 @@ WeaveSvc.prototype = {
       this.passphrase = newphrase;
       this.persistLogin();
 
       /* We need to re-encrypt everything, so reset. */
       this.resetClient();
       CollectionKeys.clear();
 
       /* Login and sync. This also generates new keys. */
-      this.sync(true);
+      this.sync();
       return true;
     }))(),
 
   startOver: function() {
     // Deletion doesn't make sense if we aren't set up yet!
     if (this.clusterURL != "") {
       // Clear client-specific data from the server, including disabled engines.
       for each (let engine in [Clients].concat(Engines.getAll())) {