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

source_changes at macosforge.org source_changes at macosforge.org
Fri May 23 23:00:00 PDT 2008


Revision: 2486
          http://trac.macosforge.org/projects/calendarserver/changeset/2486
Author:   wsanchez at apple.com
Date:     2008-05-23 23:00:00 -0700 (Fri, 23 May 2008)

Log Message:
-----------
Only provision files once.  Means you have to bounce the server if someone deletes a permanently instantiated resource.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/principal.py
    CalendarServer/trunk/twistedcaldav/static.py

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2008-05-24 05:58:59 UTC (rev 2485)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2008-05-24 06:00:00 UTC (rev 2486)
@@ -117,8 +117,6 @@
         # FIXME: Smells like a hack
         self.directory.principalCollection = self
 
-        self._provisioned = False
-
         #
         # Create children
         #
@@ -205,9 +203,7 @@
         raise HTTPError(responsecode.NOT_FOUND)
 
     def getChild(self, name):
-        if not self._provisioned:
-            self.provision()
-            self._provisioned = True
+        self.provision()
 
         if name == "":
             return self
@@ -296,7 +292,6 @@
         )
 
         self.parent = parent
-        self._provisioned = False
 
     def principalForUID(self, uid):
         return self.parent.principalForUID(uid)
@@ -313,9 +308,7 @@
         raise HTTPError(responsecode.NOT_FOUND)
 
     def getChild(self, name):
-        if not self._provisioned:
-            self.provision()
-            self._provisioned = True
+        self.provision()
 
         if name == "":
             return self

Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py	2008-05-24 05:58:59 UTC (rev 2485)
+++ CalendarServer/trunk/twistedcaldav/static.py	2008-05-24 06:00:00 UTC (rev 2486)
@@ -421,6 +421,11 @@
 
 
     def provisionFile(self):
+        if hasattr(self, "_provisioned_file"):
+            return False
+        else:
+            self._provisioned_file = True
+
         fp = self.fp
 
         fp.restat(False)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080523/ecd78bca/attachment.htm 


More information about the calendarserver-changes mailing list