[CalendarServer-changes] [2312] CalendarServer/trunk/twistedcaldav/directory/resource.py

[source_changes at macosforge.org]

Revision: 2312
          http://trac.macosforge.org/projects/calendarserver/changeset/2312
Author:   wsanchez at apple.com
Date:     2008-04-15 09:31:23 -0700 (Tue, 15 Apr 2008)

Log Message:
-----------
Provision self before child.

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

Modified: CalendarServer/trunk/twistedcaldav/directory/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/resource.py	2008-04-14 20:07:16 UTC (rev 2311)
+++ CalendarServer/trunk/twistedcaldav/directory/resource.py	2008-04-15 16:31:23 UTC (rev 2312)
@@ -55,11 +55,11 @@
         This implementation calls L{provision}, then super's L{locateChild}, thereby
         ensuring that looked-up resources are provisioned.
         """
+        d = maybeDeferred(self.provision)
+
         name = segments[0]
-        if name == "":
-            d = succeed(None)
-        else:
-            d = maybeDeferred(self.provisionChild, name)
-        d.addCallback(lambda _: self.provision())
+        if name != "":
+            d.addCallback(lambda _: self.provisionChild(name))
+
         d.addCallback(lambda _: super(AutoProvisioningResourceMixIn, self).locateChild(request, segments))
         return d

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080415/13bd371c/attachment.html