From 37616243f9b6bf7c6d675a02ac93519915d32bdd Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Fri, 22 May 2015 19:02:44 +0200 Subject: [PATCH] Bug 1166853 - Sync "hangs" when trying to apply a livemark to a reconciled folder. r=rnewman --- services/sync/modules/engines/bookmarks.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/sync/modules/engines/bookmarks.js b/services/sync/modules/engines/bookmarks.js index b062795c2df..3d0ebcacca2 100644 --- a/services/sync/modules/engines/bookmarks.js +++ b/services/sync/modules/engines/bookmarks.js @@ -771,7 +771,10 @@ BookmarksStore.prototype = { guid: record.id}; PlacesUtils.livemarks.addLivemark(livemarkObj).then( aLivemark => { spinningCb(null, [Components.results.NS_OK, aLivemark]) }, - () => { spinningCb(null, [Components.results.NS_ERROR_UNEXPECTED, aLivemark]) } + ex => { + this._log.error("creating livemark failed: " + ex); + spinningCb(null, [Components.results.NS_ERROR_UNEXPECTED, null]) + } ); let [status, livemark] = spinningCb.wait();