[CalendarServer-changes] [9901] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 9901
          http://trac.calendarserver.org//changeset/9901
Author:   glyph at apple.com
Date:     2012-10-05 17:20:23 -0700 (Fri, 05 Oct 2012)
Log Message:
-----------
Make StreamProducer._doWrite safe for reentrancy.

Modified Paths:
--------------
    CalendarServer/trunk/twext/web2/stream.py

Property Changed:
----------------
    CalendarServer/trunk/

Modified: CalendarServer/trunk/twext/web2/stream.py
===================================================================
--- CalendarServer/trunk/twext/web2/stream.py	2012-10-05 22:56:34 UTC (rev 9900)
+++ CalendarServer/trunk/twext/web2/stream.py	2012-10-06 00:20:23 UTC (rev 9901)
@@ -763,7 +763,8 @@
             return
         
         if isinstance(data, Deferred):
-            self.deferred = data.addCallbacks(self._doWrite, self.stopProducing)
+            self.deferred = data
+            self.deferred.addCallbacks(self._doWrite, self.stopProducing)
         else:
             self._doWrite(data)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121005/061e2a35/attachment.html>