[CalendarServer-changes] [229] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 229
          http://trac.macosforge.org/projects/calendarserver/changeset/229
Author:   cdaboo at apple.com
Date:     2006-10-02 20:17:05 -0700 (Mon, 02 Oct 2006)

Log Message:
-----------
Fix for problem with exceptions when doing scheduling principal lookups.

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

Modified: CalendarServer/trunk/twistedcaldav/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory.py	2006-10-03 02:50:25 UTC (rev 228)
+++ CalendarServer/trunk/twistedcaldav/directory.py	2006-10-03 03:17:05 UTC (rev 229)
@@ -1030,7 +1030,7 @@
         ):
             child_fp = self.fp.child(name)
             if not child_fp.exists(): child_fp.makedirs()
-            principalCollection = clazz(child_fp.path, joinURL(url, name))
+            principalCollection = clazz(child_fp.path, joinURL(url, name) + "/")
             principalCollection.setup(self.directory)
             self.putChild(name, principalCollection)
 

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2006-10-03 02:50:25 UTC (rev 228)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2006-10-03 03:17:05 UTC (rev 229)
@@ -429,7 +429,8 @@
         self._url = url
 
         # Register self with class
-        CalendarPrincipalCollectionResource._principleCollectionSet[url] = self
+        if url not in CalendarPrincipalCollectionResource._principleCollectionSet:
+            CalendarPrincipalCollectionResource._principleCollectionSet[url] = self
 
     def isCollection(self):
         return True

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061002/1d6dceb0/attachment.html