From 0fa2a4e29013ee3cfdf60c938fc73b308e939874 Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com"
 <reed%reedloden.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 4 Mar 2008 11:30:35 +0000
Subject: [PATCH] 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
---
 .../toolkit/components/places/src/nsLivemarkService.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mozilla/toolkit/components/places/src/nsLivemarkService.js b/mozilla/toolkit/components/places/src/nsLivemarkService.js
index b2657d30899..c4a8aa8f624 100644
--- a/mozilla/toolkit/components/places/src/nsLivemarkService.js
+++ b/mozilla/toolkit/components/places/src/nsLivemarkService.js
@@ -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,