[Zope-Checkins] CVS: Packages/webdav - Resource.py:1.55.10.5.8.2

[Sidnei da Silva]

Update of /cvs-repository/Packages/webdav
In directory cvs.zope.org:/tmp/cvs-serv15381/lib/python/webdav

Modified Files:
      Tag: dc-large_file-branch
	Resource.py 
Log Message:
Revert unwanted change on branch.


=== Packages/webdav/Resource.py 1.55.10.5.8.1 => 1.55.10.5.8.2 ===
--- Packages/webdav/Resource.py:1.55.10.5.8.1	Wed Dec  1 15:09:56 2004
+++ Packages/webdav/Resource.py	Wed Dec  1 16:58:27 2004
@@ -370,9 +370,13 @@
             else:
                 raise Locked, 'Destination is locked.'
 
-        ob = self._getCopy(parent)
-        ob._setId(name)
+        ob=self._getCopy(parent)
+        ob.manage_afterClone(ob)
+        # We remove any locks from the copied object because webdav clients
+        # don't track the lock status and the lock token for copied resources
+        ob.wl_clearLocks()
 
+        ob._setId(name)
         if depth=='0' and isDavCollection(ob):
             for id in ob.objectIds():
                 ob._delObject(id)
@@ -381,11 +385,6 @@
             self.dav__validate(object, 'DELETE', REQUEST)
             parent._delObject(name)
         parent._setObject(name, ob)
-        ob = parent._getOb(name)
-        ob.manage_afterClone(ob)
-        # We remove any locks from the copied object because webdav clients
-        # don't track the lock status and the lock token for copied resources
-        ob.wl_clearLocks()
         RESPONSE.setStatus(existing and 204 or 201)
         if not existing:
             RESPONSE.setHeader('Location', dest)