[CalendarServer-changes] [7440] CalendarServer/trunk/twistedcaldav/schedule.py

[source_changes at macosforge.org]

Revision: 7440
          http://trac.macosforge.org/projects/calendarserver/changeset/7440
Author:   cdaboo at apple.com
Date:     2011-05-13 11:32:35 -0700 (Fri, 13 May 2011)
Log Message:
-----------
Properly handle the case where a bring LinkResource might be present.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/schedule.py

Modified: CalendarServer/trunk/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/schedule.py	2011-05-13 18:30:54 UTC (rev 7439)
+++ CalendarServer/trunk/twistedcaldav/schedule.py	2011-05-13 18:32:35 UTC (rev 7440)
@@ -168,7 +168,7 @@
             if defaultCalendarProperty and len(defaultCalendarProperty.children) == 1:
                 defaultCalendar = str(defaultCalendarProperty.children[0])
                 cal = (yield request.locateResource(str(defaultCalendar)))
-                if cal is not None and cal.exists() and isCalendarCollectionResource(cal):
+                if cal is not None and isCalendarCollectionResource(cal) and cal.exists():
                     returnValue(defaultCalendarProperty) 
             
             # Default is not valid - we have to try to pick one
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110513/6a838b0f/attachment.html>