[CalendarServer-changes] [3361] CalendarServer/trunk/twistedcaldav/method

[source_changes at macosforge.org]

Revision: 3361
          http://trac.macosforge.org/projects/calendarserver/changeset/3361
Author:   cdaboo at apple.com
Date:     2008-11-10 18:28:06 -0800 (Mon, 10 Nov 2008)
Log Message:
-----------
Minor clean-up.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/method/delete.py
    CalendarServer/trunk/twistedcaldav/method/put_common.py

Modified: CalendarServer/trunk/twistedcaldav/method/delete.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/delete.py	2008-11-11 01:38:43 UTC (rev 3360)
+++ CalendarServer/trunk/twistedcaldav/method/delete.py	2008-11-11 02:28:06 UTC (rev 3361)
@@ -113,16 +113,12 @@
                 
                 # Do some clean up
                 yield self.deletedCalendar(request)
-                
-        if lock:
-            yield lock.release()
 
     except MemcacheLockTimeoutError:
         raise HTTPError(StatusResponse(responsecode.CONFLICT, "Resource: %s currently in use on the server." % (self.uri,)))
 
-    except Exception, e:
+    finally:
         if lock:
             yield lock.clean()
-        raise e
 
     returnValue(response)

Modified: CalendarServer/trunk/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/put_common.py	2008-11-11 01:38:43 UTC (rev 3360)
+++ CalendarServer/trunk/twistedcaldav/method/put_common.py	2008-11-11 02:28:06 UTC (rev 3361)
@@ -147,9 +147,9 @@
         
         def __init__(self, index, uid, uri, internal_request):
             if internal_request:
-                self._lock = None
+                self.lock = None
             else:
-                self._lock = MemcacheLock("ImplicitUIDLock", uid, timeout=60.0)
+                self.lock = MemcacheLock("ImplicitUIDLock", uid, timeout=60.0)
             self.reserved = False
             self.index = index
             self.uid = uid
@@ -159,9 +159,9 @@
         def reserve(self):
             
             # Implicit lock
-            if self._lock:
+            if self.lock:
                 try:
-                    yield self._lock.acquire()
+                    yield self.lock.acquire()
                 except MemcacheLockTimeoutError:
                     raise HTTPError(StatusResponse(responsecode.CONFLICT, "Resource: %s currently in use on the server." % (self.uri,)))
 
@@ -184,8 +184,8 @@
                 yield pause
             
             if self.uri and not self.reserved:
-                if self._lock:
-                    yield self._lock.release()
+                if self.lock:
+                    yield self.lock.release()
                 raise HTTPError(StatusResponse(responsecode.CONFLICT, "Resource: %s currently in use in calendar." % (self.uri,)))
         
         @inlineCallbacks
@@ -193,8 +193,8 @@
             if self.reserved:
                 yield self.index.unreserveUID(self.uid)
                 self.reserved = False
-            if self._lock:
-                yield self._lock.clean()
+            if self.lock:
+                yield self.lock.clean()
 
     def __init__(
         self,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081110/b0db23b3/attachment.html>