Bug 666685 follow-up: continue to not overwrite the lazy getter if building the map fails. a=zpao-owes-me-a-beer

This commit is contained in:
Philipp von Weitershausen 2011-06-24 02:18:24 +02:00
parent ae005f5d25
commit 82c7636475

View File

@ -396,9 +396,9 @@ BookmarksEngine.prototype = {
// Create a mapping of folder titles and separator positions to GUID.
// We do this lazily so that we don't do any work unless we reconcile
// incoming items.
let guidMap;
try {
delete this._guidMap;
return this._guidMap = this._buildGUIDMap();
guidMap = this._buildGUIDMap();
} catch (ex) {
this._log.warn("Got exception \"" + Utils.exceptionStr(ex) +
"\" building GUID map." +
@ -406,6 +406,8 @@ BookmarksEngine.prototype = {
throw {code: Engine.prototype.eEngineAbortApplyIncoming,
cause: ex};
}
delete this._guidMap;
return this._guidMap = guidMap;
});
this._store._childrenToOrder = {};