Backed out 2 changesets (bug 1581909) for test failures in calendar/test/unit/test_providers.js. a=backout DONTBUILD
authorJorg K <jorgk@jorgk.com>
Thu, 19 Sep 2019 12:53:33 +0200
changeset 79016 2148bb88117e96f83d4c780f2707fc44ed2423f8
parent 79015 220b3257a60ab0abbb00a57e1d93abc159d45ed7
child 79017 ec7a23f9bcfd63e88fb50a05a8f91c72b7885dc7
child 79018 a672778eaee830407f11ce9d71154c7e456ced61
child 79019 8f257c99374a359acd54244c4d4488d0dbffed6e
child 79020 2a1507d53ad55de2410691d27f93d5e191d0ea8d
child 79021 344aca0c9c42ba5546658100fa86e3806b6c012a
push id9335
push usermozilla@jorgk.com
push dateThu, 19 Sep 2019 10:56:46 +0000
treeherdertry-comm-central@ec7a23f9bcfd [default view] [failures only]
reviewersbackout
bugs1581909
backs out2fd4b75c695082f82642c58d06948f11784d552d
d52c5f0981525fe1b66bc0f450ce4d667fb22b15
Backed out 2 changesets (bug 1581909) for test failures in calendar/test/unit/test_providers.js. a=backout DONTBUILD Backed out changeset 2fd4b75c6950 (bug 1581909) Backed out changeset d52c5f098152 (bug 1581909)
calendar/providers/storage/calStorageCalendar.js
--- a/calendar/providers/storage/calStorageCalendar.js
+++ b/calendar/providers/storage/calStorageCalendar.js
@@ -1647,18 +1647,16 @@ calStorageCalendar.prototype = {
       this.mRecItemCachePromise = this._assureRecurringItemCaches();
     }
     return this.mRecItemCachePromise;
   },
   _assureRecurringItemCaches: async function() {
     // build up recurring event and todo cache with its offline flags,
     // because we need that on every query: for recurring items, we need to
     // query database-wide.. yuck
-    this.mItemCache.clear();
-
     let events = [];
     let itemsMap = new Map();
     this.prepareStatement(this.mSelectEventsWithRecurrence);
     await this.executeAsync(this.mSelectEventsWithRecurrence, async row => {
       events.push(row);
     });
     for (let row of events) {
       let item = await this.getEventFromRow(row, false);
@@ -1729,21 +1727,19 @@ calStorageCalendar.prototype = {
 
     this.prepareStatement(this.mSelectAllRecurrences);
     await this.executeAsync(this.mSelectAllRecurrences, row => {
       let item = itemsMap.get(row.getResultByName("item_id"));
       if (!item) {
         return;
       }
 
-      if (!item.recurrenceInfo) {
-        item.recurrenceInfo = cal.createRecurrenceInfo(item);
-      }
+      let recInfo = cal.createRecurrenceInfo(item);
+      item.recurrenceInfo = recInfo;
 
-      let recInfo = item.recurrenceInfo;
       let ritem = this.getRecurrenceItemFromRow(row);
       recInfo.appendRecurrenceItem(ritem);
     });
 
     this.prepareStatement(this.mSelectAllEventExceptions);
     await this.executeAsync(this.mSelectAllEventExceptions, async row => {
       let item = itemsMap.get(row.getResultByName("id"));
       if (!item) {