[CalendarServer-changes] [4762] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 4762
          http://trac.macosforge.org/projects/calendarserver/changeset/4762
Author:   cdaboo at apple.com
Date:     2009-11-18 09:30:22 -0800 (Wed, 18 Nov 2009)
Log Message:
-----------
Turn bool into a counter so that multiple auto-accept processing works.

Modified Paths:
--------------
    CalendarServer/trunk/support/build.sh
    CalendarServer/trunk/twistedcaldav/scheduling/implicit.py

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2009-11-18 17:28:43 UTC (rev 4761)
+++ CalendarServer/trunk/support/build.sh	2009-11-18 17:30:22 UTC (rev 4762)
@@ -496,7 +496,7 @@
     false true true true 212;
 
   # Tool dependencies.  The code itself doesn't depend on these, but you probably want them.
-  svn_get "CalDAVTester" "${top}/CalDAVTester" "${svn_uri_base}/CalDAVTester/trunk" 4759;
+  svn_get "CalDAVTester" "${top}/CalDAVTester" "${svn_uri_base}/CalDAVTester/trunk" 4761;
   svn_get "Pyflakes" "${top}/Pyflakes" http://divmod.org/svn/Divmod/trunk/Pyflakes 17198;
 }
 

Modified: CalendarServer/trunk/twistedcaldav/scheduling/implicit.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/implicit.py	2009-11-18 17:28:43 UTC (rev 4761)
+++ CalendarServer/trunk/twistedcaldav/scheduling/implicit.py	2009-11-18 17:30:22 UTC (rev 4762)
@@ -284,11 +284,16 @@
             if attendee.params().get("PARTSTAT", ["NEEDS-ACTION"])[0] == "NEEDS-ACTION":
                 self.request.suppressRefresh = True
         
-        self.request.doing_attendee_refresh = True
+        if hasattr(self.request, "doing_attendee_refresh"):
+            self.request.doing_attendee_refresh += 1
+        else:
+            self.request.doing_attendee_refresh = 1
         try:
             refreshCount = (yield self.processRequests())
         finally:
-            delattr(self.request, "doing_attendee_refresh")
+            self.request.doing_attendee_refresh -= 1
+            if self.request.doing_attendee_refresh == 0:
+                delattr(self.request, "doing_attendee_refresh")
 
         if refreshCount:
             if not hasattr(self.request, "extendedLogItems"):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091118/8591d1e7/attachment.html>