[CalendarServer-changes] [9010] CalendarServer/trunk/contrib/performance/loadtest/ical.py

[source_changes at macosforge.org]

Revision: 9010
          http://trac.macosforge.org/projects/calendarserver/changeset/9010
Author:   cdaboo at apple.com
Date:     2012-04-10 12:49:31 -0700 (Tue, 10 Apr 2012)
Log Message:
-----------
Fix for XMPP concurrency issue.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/ical.py

Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/ical.py	2012-04-10 19:25:35 UTC (rev 9009)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py	2012-04-10 19:49:31 UTC (rev 9010)
@@ -740,13 +740,14 @@
         try:
             result = yield self._newOperation("push" if push else "poll", self._poll(calendarHomeSet, firstTime))
         finally:
-            self._checking.remove(calendarHomeSet)
+            if result:
+                self._checking.remove(calendarHomeSet)
         returnValue(result)
 
     @inlineCallbacks
     def _poll(self, calendarHomeSet, firstTime):
         if calendarHomeSet in self._checking:
-            returnValue(None)
+            returnValue(False)
         self._checking.add(calendarHomeSet)
 
         calendars, results = yield self._calendarHomePropfind(calendarHomeSet)
@@ -776,6 +777,8 @@
         # One time delegate expansion
         if firstTime:
             yield self._pollFirstTime2()
+            
+        returnValue(True)
 
     @inlineCallbacks
     def _pollFirstTime1(self, homeNode, calendars):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120410/863b7d73/attachment.html>