[CalendarServer-changes] [5852] CalendarServer/branches/users/wsanchez/deployment-pre-partition

source_changes at macosforge.org source_changes at macosforge.org
Wed Jul 7 10:10:36 PDT 2010


Revision: 5852
          http://trac.macosforge.org/projects/calendarserver/changeset/5852
Author:   wsanchez at apple.com
Date:     2010-07-07 10:10:34 -0700 (Wed, 07 Jul 2010)
Log Message:
-----------
Pull up 5845

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/method/put_common.py

Property Changed:
----------------
    CalendarServer/branches/users/wsanchez/deployment-pre-partition/


Property changes on: CalendarServer/branches/users/wsanchez/deployment-pre-partition
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalendarServer/branches/users/glyph/deployment-plus-sendfd:5426-5429
/CalendarServer/branches/users/sagen/deployment-inherit-fds-4571:4573-4709
/CalendarServer/branches/users/sagen/deployment-inspection:4927-4937
   + /CalendarServer/branches/users/glyph/deployment-plus-sendfd:5426-5429
/CalendarServer/branches/users/sagen/deployment-inherit-fds-4571:4573-4709
/CalendarServer/branches/users/sagen/deployment-inspection:4927-4937
/CalendarServer/branches/users/wsanchez/deployment:5845

Modified: CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/method/put_common.py	2010-07-07 17:03:35 UTC (rev 5851)
+++ CalendarServer/branches/users/wsanchez/deployment-pre-partition/twistedcaldav/method/put_common.py	2010-07-07 17:10:34 UTC (rev 5852)
@@ -463,9 +463,12 @@
             # a race condition where two simultaneous PUTs with If-Match can conflict (i.e. second PUT does
             # not fail even though underlying resource was changed by first PUT). We also need to reload the
             # property cache before we do this as the etag property may have changed.
-            if destination.exists():
-                destination.deadProperties().reloadCache()
-            destination.checkPreconditions(request)
+            #
+            # Currently only care about this on a PUT
+            if source is None:
+                if destination.exists():
+                    destination.deadProperties().reloadCache()
+                destination.checkPreconditions(request)
 
             # uid conflict check - note we do this after reserving the UID to avoid a race condition where two requests
             # try to write the same calendar data to two different resource URIs.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100707/47831aab/attachment.html>


More information about the calendarserver-changes mailing list