[CalendarServer-changes] [3916] CalendarServer/trunk/twistedcaldav/directory/cachingdirectory.py

[source_changes at macosforge.org]

Revision: 3916
          http://trac.macosforge.org/projects/calendarserver/changeset/3916
Author:   sagen at apple.com
Date:     2009-03-24 13:13:00 -0700 (Tue, 24 Mar 2009)
Log Message:
-----------
Also remove timed out records

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/cachingdirectory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/cachingdirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/cachingdirectory.py	2009-03-24 17:45:54 UTC (rev 3915)
+++ CalendarServer/trunk/twistedcaldav/directory/cachingdirectory.py	2009-03-24 20:13:00 UTC (rev 3916)
@@ -93,7 +93,7 @@
                     continue
                 if isinstance(indexData, str):
                     indexData = (indexData,)
-                if type(indexData) in (types.ListType, types.TupleType):
+                if type(indexData) in (types.ListType, types.TupleType, set):
                     for item in indexData:
                         try:
                             del self.recordsIndexedBy[indexType][item]
@@ -182,6 +182,7 @@
                 record = self.recordCacheForType(recordType).findRecord(indexType, indexKey)
                 if record:
                     if (time.time() - record.cachedTime > self.cacheTimeout):
+                        self.recordCacheForType(recordType).removeRecord(record)
                         return None
                     else:
                         return record
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090324/a5c710a0/attachment.html>