[CalendarServer-changes] [1234] CalendarServer/branches/users/cdaboo/sqlprops-1202/twistedcaldav/ directory/resource.py

[source_changes at macosforge.org]

Revision: 1234
          http://trac.macosforge.org/projects/calendarserver/changeset/1234
Author:   cdaboo at apple.com
Date:     2007-02-22 13:49:08 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
Need to make sure self.provision() is called before self.provisionChild(), so re-order the deferred and callbacks.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/sqlprops-1202/twistedcaldav/directory/resource.py

Modified: CalendarServer/branches/users/cdaboo/sqlprops-1202/twistedcaldav/directory/resource.py
===================================================================
--- CalendarServer/branches/users/cdaboo/sqlprops-1202/twistedcaldav/directory/resource.py	2007-02-22 01:42:31 UTC (rev 1233)
+++ CalendarServer/branches/users/cdaboo/sqlprops-1202/twistedcaldav/directory/resource.py	2007-02-22 21:49:08 UTC (rev 1234)
@@ -58,10 +58,8 @@
         ensuring that looked-up resources are provisioned.
         """
         name = segments[0]
-        if name == "":
-            d = succeed(None)
-        else:
-            d = maybeDeferred(self.provisionChild, name)
-        d.addCallback(lambda _: self.provision())
+        d = maybeDeferred(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/20070222/7573be76/attachment.html