Bug 419885 - "livemark update could fail due to an uncaught exception" [p=mak77@supereva.it (Marco Bonardo [mak77]) r=dietrich a=blocking-firefox3+]
git-svn-id: svn://10.0.0.236/trunk@246996 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
94f2929a67
commit
0fa2a4e290
@ -236,7 +236,7 @@ LivemarkService.prototype = {
|
||||
_updateLivemarkChildren:
|
||||
function LS__updateLivemarkChildren(index, forceUpdate) {
|
||||
if (this._livemarks[index].locked)
|
||||
return;
|
||||
return false;
|
||||
|
||||
var livemark = this._livemarks[index];
|
||||
livemark.locked = true;
|
||||
@ -250,7 +250,7 @@ LivemarkService.prototype = {
|
||||
if (!forceUpdate && exprTime > Date.now()) {
|
||||
// no need to refresh
|
||||
livemark.locked = false;
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check the user idle time. If the user isn't using their computer, don't
|
||||
@ -263,7 +263,7 @@ LivemarkService.prototype = {
|
||||
if (idleTime > IDLE_TIMELIMIT)
|
||||
{
|
||||
livemark.locked = false;
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch (ex) {
|
||||
@ -297,10 +297,10 @@ LivemarkService.prototype = {
|
||||
}
|
||||
MarkLivemarkLoadFailed(livemark.folderId);
|
||||
livemark.locked = false;
|
||||
LOG("exception: " + ex);
|
||||
throw ex;
|
||||
return false;
|
||||
}
|
||||
livemark.loadGroup = loadgroup;
|
||||
return true;
|
||||
},
|
||||
|
||||
createLivemark: function LS_createLivemark(folder, name, siteURI,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user