Revision: 3604 http://trac.macosforge.org/projects/calendarserver/changeset/3604 Author: sagen@apple.com Date: 2009-01-21 15:23:36 -0800 (Wed, 21 Jan 2009) Log Message: ----------- Don't change the xmpp-uri property value depending on whether we're able to send notifications or not. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2009-01-20 22:20:07 UTC (rev 3603) +++ CalendarServer/trunk/twistedcaldav/static.py 2009-01-21 23:23:36 UTC (rev 3604) @@ -721,13 +721,9 @@ else: qname = property.qname() - - def _succeeded(result, propVal): + def doneWaiting(result, propVal): return propVal - def _failed(failure): - return customxml.PubSubXMPPURIProperty() - if qname == (customxml.calendarserver_namespace, "xmpp-uri"): pubSubConfiguration = getPubSubConfiguration(config) if pubSubConfiguration['enabled']: @@ -738,8 +734,9 @@ getPubSubXMPPURI(url, pubSubConfiguration)) nodeCacher = getNodeCacher() d = nodeCacher.waitForNode(self.clientNotifier, nodeName) - d.addCallback(_succeeded, propVal) - d.addErrback(_failed) + # In either case we're going to return the xmpp-uri value + d.addCallback(doneWaiting, propVal) + d.addErrback(doneWaiting, propVal) return d else: return succeed(customxml.PubSubXMPPURIProperty())