From b05c95d9df9a2648bb81df7505845e70f77d2675 Mon Sep 17 00:00:00 2001 From: Matthew Mecca Date: Mon, 26 Aug 2013 09:31:49 -0400 Subject: [PATCH] Bug 906650 - caldav calendar sync failing with aUri is null. r=philipp --- calendar/providers/caldav/calDavCalendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendar/providers/caldav/calDavCalendar.js b/calendar/providers/caldav/calDavCalendar.js index ab46579e71..34078a68e3 100644 --- a/calendar/providers/caldav/calDavCalendar.js +++ b/calendar/providers/caldav/calDavCalendar.js @@ -325,7 +325,7 @@ calDavCalendar.prototype = { // Google does its CalDAV v2 authentication via OAuth. Since there is // no builtin OAuth support, we have to inject the tokens here. - if (aUri.host == "apidata.googleusercontent.com" && + if (aUri && aUri.host == "apidata.googleusercontent.com" && this.oauth && this.oauth.accessToken) { let hdr = "Bearer " + this.oauth.accessToken; channel.setRequestHeader("Authorization", hdr, false);