[CalendarServer-changes] [7264] CalendarServer/trunk/twistedcaldav/notify.py

[source_changes at macosforge.org]

Revision: 7264
          http://trac.macosforge.org/projects/calendarserver/changeset/7264
Author:   sagen at apple.com
Date:     2011-03-25 13:42:44 -0700 (Fri, 25 Mar 2011)
Log Message:
-----------
Fixes receiving a connection-lost in createNodeFailure

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/notify.py

Modified: CalendarServer/trunk/twistedcaldav/notify.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/notify.py	2011-03-25 19:54:29 UTC (rev 7263)
+++ CalendarServer/trunk/twistedcaldav/notify.py	2011-03-25 20:42:44 UTC (rev 7264)
@@ -772,7 +772,13 @@
                 self.log_error("PubSub node creation error: %s" %
                     (iq.toXml().encode('ascii', 'replace')),)
                 self.sendError("Node creation failed (%s)" % (nodeName,), iq)
+        except AttributeError:
+            # We did not get an XML response; most likely it was a disconnection
+            self.unlockNode(None, nodeName)
+            # Don't re-raise, just unlock and ignore
         except:
+            # Note: this block is not a "finally" because in the case of a 409
+            # we don't want to unlock yet
             self.unlockNode(None, nodeName)
             raise
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110325/5df63a36/attachment.html>