[CalendarServer-changes] [9443] CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing .py

[source_changes at macosforge.org]

Revision: 9443
          http://trac.macosforge.org/projects/calendarserver/changeset/9443
Author:   gaya at apple.com
Date:     2012-07-12 16:31:40 -0700 (Thu, 12 Jul 2012)
Log Message:
-----------
fix lock string

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py

Modified: CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py	2012-07-12 22:09:10 UTC (rev 9442)
+++ CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py	2012-07-12 23:31:40 UTC (rev 9443)
@@ -571,6 +571,7 @@
             returnValue(False)
 
         principalUID = principal.principalUID()
+        userid = "urn:uuid:" + principalUID
 
         # Acquire a memcache lock based on collection URL and sharee UID
         # TODO: when sharing moves into the store this should be replaced
@@ -654,13 +655,15 @@
             pass
         
         # Generate invite XML
+        userid = "urn:uuid:" + record.principalUID
+
         typeAttr = {'shared-type':self.sharedResourceType()}
         xmltype = customxml.InviteNotification(**typeAttr)
         xmldata = customxml.Notification(
             customxml.DTStamp.fromString(PyCalendarDateTime.getNowUTC().getText()),
             customxml.InviteNotification(
                 customxml.UID.fromString(record.inviteuid),
-                element.HRef.fromString("urn:uuid:" + record.principalUID),
+                element.HRef.fromString(userid),
                 inviteStatusMapToXML[record.state](),
                 customxml.InviteAccess(inviteAccessMapToXML[record.access]()),
                 customxml.HostURL(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120712/13007932/attachment.html>