Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset ccc602619a07 (bug 1332993) for failing xpcshell test test_accounts.js at least on Linux. r=backout on a CLOSED TREE

Browse Source
This commit is contained in:
Sebastian Hengst 2017-01-24 18:34:08 +01:00
parent 444bade64c
commit 461878052c
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/fxaccounts/FxAccountsProfile.jsm
View File

@ -72,6 +72,7 @@ this.FxAccountsProfile.prototype = {
// Cache fetched data and send out a notification so that UI can update.
_cacheProfile(response) {
this._cachedAt = Date.now();
let profileCache = {
profile: response.body,
etag: response.etag
@ -89,10 +90,6 @@ this.FxAccountsProfile.prototype = {
},
_fetchAndCacheProfileInternal() {
let onFinally = () => {
this._cachedAt = Date.now();
this._currentFetchPromise = null;
}
return this.fxa.getProfileCache()
.then(profileCache => {
const etag = profileCache ? profileCache.etag : null;
@ -102,13 +99,11 @@ this.FxAccountsProfile.prototype = {
return this._cacheProfile(response);
})
.then(body => { // finally block
onFinally();
this._currentFetchPromise = null;
return body;
}, err => {
onFinally();
if (err.code != 304) { // fetchProfile() throws when the profile wasn't modified
throw e;
}
}, e => {
this._currentFetchPromise = null;
throw e;
});
},
@ -130,7 +125,8 @@ this.FxAccountsProfile.prototype = {
// Note that _fetchAndCacheProfile isn't returned, so continues
// in the background.
this._fetchAndCacheProfile().catch(err => {
log.error("Background refresh of profile failed", err);
log.error("Background refresh of profile failed, bumping _cachedAt", err);
this._cachedAt = Date.now();
});
} else {
log.trace("not checking freshness of profile as it remains recent");