[CalendarServer-changes] [6276] CalendarServer/trunk/txdav/common/datastore/util.py

[source_changes at macosforge.org]

Revision: 6276
          http://trac.macosforge.org/projects/calendarserver/changeset/6276
Author:   glyph at apple.com
Date:     2010-09-10 15:47:58 -0700 (Fri, 10 Sep 2010)
Log Message:
-----------
work around a small plan-interference bug in Twisted

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/util.py

Modified: CalendarServer/trunk/txdav/common/datastore/util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/util.py	2010-09-10 20:11:01 UTC (rev 6275)
+++ CalendarServer/trunk/txdav/common/datastore/util.py	2010-09-10 22:47:58 UTC (rev 6276)
@@ -22,6 +22,7 @@
 from txdav.caldav.datastore.util import migrateHome as migrateCalendarHome
 from txdav.carddav.datastore.util import migrateHome as migrateAddressbookHome
 from twisted.internet.defer import inlineCallbacks
+from twisted.internet import reactor
 
 
 class UpgradeToDatabaseService(Service, LoggingMixIn, object):
@@ -122,7 +123,8 @@
         self.log_warn(
             "Filesystem upgrade complete, launching database service."
         )
-        self.wrappedService.setServiceParent(self.parent)
+        # see http://twistedmatrix.com/trac/ticket/4649
+        reactor.callLater(0, self.wrappedService.setServiceParent, self.parent)
 
 
     def startService(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100910/82d56db2/attachment.html>