Backout of 7cb26c341a4e due to new TPS sync failures

This commit is contained in:
Henrik Skupin 2014-08-29 22:37:44 +02:00
parent e3a1f87d6e
commit c847015097

View File

@ -300,7 +300,12 @@ let TPS = {
Logger.logInfo("tab for " + taburi + " finished loading");
if (that._tabsFinished == that._tabsAdded) {
Logger.logInfo("all tabs loaded, continuing...");
that.FinishAsyncOperation();
// Wait a second before continuing to be sure tabs can be synced,
// otherwise we can get 'error locating tab'
Utils.namedTimer(function () {
that.FinishAsyncOperation();
}, 1000, this, "postTabsOpening");
}
});
break;
@ -890,13 +895,7 @@ let TPS = {
this._triggeredSync = true;
this.StartAsyncOperation();
// Bug 682446
// We wait a little before we trigger the Sync call to be sure elements are
// ready to be synced
Utils.namedTimer(function () {
Weave.Service.sync();
}, 2500, this, "beforeSyncDelay");
Weave.Service.sync();
},
WipeServer: function TPS__WipeServer() {