[CalendarServer-changes] [4521] CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/ extensions.py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Sep 1 13:53:58 PDT 2009
Revision: 4521
http://trac.macosforge.org/projects/calendarserver/changeset/4521
Author: cdaboo at apple.com
Date: 2009-09-01 13:53:53 -0700 (Tue, 01 Sep 2009)
Log Message:
-----------
Query may return a record for a user that is not enabled so there may not be a principal.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/extensions.py
Modified: CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/extensions.py 2009-09-01 18:32:32 UTC (rev 4520)
+++ CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/extensions.py 2009-09-01 20:53:53 UTC (rev 4521)
@@ -437,17 +437,18 @@
for record in records:
resource = principalCollection.principalForRecord(record)
- matchingResources.append(resource)
+ if resource:
+ matchingResources.append(resource)
+
+ # We've determined this is a matching resource
+ matchcount += 1
+ if clientLimit is not None and matchcount >= clientLimit:
+ resultsWereLimited = ("client", matchcount)
+ break
+ if matchcount >= max_number_of_matches:
+ resultsWereLimited = ("server", matchcount)
+ break
- # We've determined this is a matching resource
- matchcount += 1
- if clientLimit is not None and matchcount >= clientLimit:
- resultsWereLimited = ("client", matchcount)
- break
- if matchcount >= max_number_of_matches:
- resultsWereLimited = ("server", matchcount)
- break
-
# Generate the response
responses = []
for resource in matchingResources:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090901/8b87f1c4/attachment.html>
More information about the calendarserver-changes
mailing list