[CalendarServer-changes] [11515] CalendarServer/branches/users/cdaboo/CalendarServer-5.0-podfix/ twistedcaldav/datafilters/peruserdata.py

[source_changes at macosforge.org]

Revision: 11515
          http://trac.calendarserver.org//changeset/11515
Author:   cdaboo at apple.com
Date:     2013-07-14 10:37:39 -0700 (Sun, 14 Jul 2013)
Log Message:
-----------
If a per-user instance R-ID is invalid due to earlier buggy data being saved, simply ignore it.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/CalendarServer-5.0-podfix/twistedcaldav/datafilters/peruserdata.py

Modified: CalendarServer/branches/users/cdaboo/CalendarServer-5.0-podfix/twistedcaldav/datafilters/peruserdata.py
===================================================================
--- CalendarServer/branches/users/cdaboo/CalendarServer-5.0-podfix/twistedcaldav/datafilters/peruserdata.py	2013-07-14 15:50:35 UTC (rev 11514)
+++ CalendarServer/branches/users/cdaboo/CalendarServer-5.0-podfix/twistedcaldav/datafilters/peruserdata.py	2013-07-14 17:37:39 UTC (rev 11515)
@@ -171,6 +171,8 @@
         if ical.masterComponent() is not None:
             for rid in peruser_only_set:
                 ical_component = ical.deriveInstance(rid)
+                if ical_component is None:
+                    continue
                 peruser_component = peruser_recurrence_map[rid]
                 self._mergeBackComponent(ical_component, peruser_component)
                 ical.addComponent(ical_component)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130714/9b7b5bd6/attachment.html>